From 7bcc02e7c92171044a0aeabd9d988189c6b849b1 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 25 Nov 2022 14:19:24 +0100
Subject: [PATCH 01/25] pdns-recursor: update to 4.7.4

Signed-off-by: Peter van Dijk <peter.van.dijk@powerdns.com>
---
 net/pdns-recursor/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile
index 065069d01..5f284bf7a 100644
--- a/net/pdns-recursor/Makefile
+++ b/net/pdns-recursor/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pdns-recursor
-PKG_VERSION:=4.7.3
+PKG_VERSION:=4.7.4
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/
-PKG_HASH:=206d766cc8f0189f79d69af64d8d937ecc61a4d13e8ea6594d78fe30e61405f2
+PKG_HASH:=17b5c7c881e3f400bb3b527dd866e5cf2cd62d5d33566b1b70b58c608d9968d5
 
 PKG_MAINTAINER:=Peter van Dijk <peter.van.dijk@powerdns.com>
 PKG_LICENCE:=GPL-2.0-only

From 46e4def61f6b670daac1725df8f3fc4475fe5450 Mon Sep 17 00:00:00 2001
From: Josh Powers <powersj@fastmail.com>
Date: Mon, 21 Nov 2022 10:32:37 -0700
Subject: [PATCH 02/25] privoxy: fix postinst missing $

fixes: #19949

Signed-off-by: Josh Powers <powersj@fastmail.com>
---
 net/privoxy/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile
index 6ce0574af..9f859c4eb 100644
--- a/net/privoxy/Makefile
+++ b/net/privoxy/Makefile
@@ -158,7 +158,7 @@ endef
 define Package/privoxy/postinst
 	#!/bin/sh
 	# if exists, update previous version entry missing protocol
-	(grep -E "privoxy.*8118$" $${IPKG_INSTROOT}/etc/services) > /dev/null \
+	(grep -E "privoxy.*8118$$" $${IPKG_INSTROOT}/etc/services) > /dev/null \
 		&& sed -i "s/privoxy.*8118/privoxy\t\t8118\/tcp/" $${IPKG_INSTROOT}/etc/services
 
 	# add missing tcp and udp entries

From dcbb2cf3d58758c86ba31ece78fa48c33d7ecda9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:03 +0100
Subject: [PATCH 03/25] xxhash: add package for 0.8.1

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 utils/xxhash/Makefile | 93 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 utils/xxhash/Makefile

diff --git a/utils/xxhash/Makefile b/utils/xxhash/Makefile
new file mode 100644
index 000000000..04924b750
--- /dev/null
+++ b/utils/xxhash/Makefile
@@ -0,0 +1,93 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+# initial implementation kindly stolen from (and then updated) :
+# https://forum.openwrt.org/t/xxhash-makefile/118426
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=xxhash
+PKG_VERSION:=0.8.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/Cyan4973/xxHash/archive/v$(PKG_VERSION)
+PKG_HASH:=3bb6b7d6f30c591dd65aaaff1c8b7a5b94d81687998ca9400082c739a690436c
+
+# The source for the library (xxhash.c and xxhash.h) is BSD
+# The source for the command line tool (xxhsum.c) is GPLv2+
+PKG_LICENSE:=BSD-2-Clause,GPL-2.0-or-later
+PKG_LICENSE_FILES:=LICENSE,cli/COPYING
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/xxhash/Default
+  TITLE:=Extremely fast hash algorithm
+  URL:=https://cyan4973.github.io/xxHash/
+endef
+
+define Package/xxhash/Default/description
+  xxHash is an Extremely fast Hash algorithm, running at RAM speed
+  limits. It successfully completes the SMHasher test suite which
+  evaluates collision, dispersion and randomness qualities of hash
+  functions. Code is highly portable, and hashes are identical on all
+  platforms (little / big endian).
+endef
+
+define Package/libxxhash
+  $(call Package/xxhash/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+endef
+
+define Package/libxxhash/description
+  $(call Package/xxhash/Default/description)
+
+  This package contains the shared library.
+endef
+
+define Package/xxhash
+  $(call Package/xxhash/Default)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:= +libxxhash
+endef
+
+define Package/xxhash/description
+  $(call Package/xxhash/Default/description)
+
+  This package contains the executables.
+endef
+
+define Build/Prepare
+	rm -rf $(PKG_BUILD_DIR)/
+	mkdir -p $(PKG_BUILD_DIR)/
+	$(TAR) -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip 1
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libxxhash.so* $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/libxxhash.pc.in $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libxxhash/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libxxhash.so.* $(1)/usr/lib
+endef
+
+define Package/xxhash/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xxh*sum $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,libxxhash))
+$(eval $(call BuildPackage,xxhash))

From 69655222fcedb299054bfdff8cf7acf24de4cefa Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:03 +0100
Subject: [PATCH 04/25] python-sortedcontainers: add package for 2.4.0

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-sortedcontainers/Makefile | 40 ++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 lang/python/python-sortedcontainers/Makefile

diff --git a/lang/python/python-sortedcontainers/Makefile b/lang/python/python-sortedcontainers/Makefile
new file mode 100644
index 000000000..b049eb980
--- /dev/null
+++ b/lang/python/python-sortedcontainers/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-sortedcontainers
+PKG_VERSION:=2.4.0
+PKG_RELEASE:=1
+
+PYPI_NAME:=sortedcontainers
+PKG_HASH:=25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-sortedcontainers
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Sorted Containers -- Sorted List, Sorted Dict, Sorted Set
+  URL:=https://grantjenks.com/docs/sortedcontainers
+  DEPENDS:=+python3-light
+endef
+
+define Package/python3-sortedcontainers/description
+  Sorted Containers is an Apache2 licensed sorted collections library, written in pure-Python, and fast as C-extensions.
+endef
+
+$(eval $(call Py3Package,python3-sortedcontainers))
+$(eval $(call BuildPackage,python3-sortedcontainers))
+$(eval $(call BuildPackage,python3-sortedcontainers-src))

From a19f331b068ba9f5fab60f149acdd9805ccdb390 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:04 +0100
Subject: [PATCH 05/25] python-exceptiongroup: add package for 1.0.4

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-exceptiongroup/Makefile    | 42 +++++++++++++++++++
 ...avoid-depending-on-flit-for-building.patch | 31 ++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 lang/python/python-exceptiongroup/Makefile
 create mode 100644 lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch

diff --git a/lang/python/python-exceptiongroup/Makefile b/lang/python/python-exceptiongroup/Makefile
new file mode 100644
index 000000000..dd64f9210
--- /dev/null
+++ b/lang/python/python-exceptiongroup/Makefile
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-exceptiongroup
+PKG_VERSION:=1.0.4
+PKG_RELEASE:=1
+
+PYPI_NAME:=exceptiongroup
+PKG_HASH:=bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec
+
+PKG_LICENSE:=MIT,Python-2.0
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-exceptiongroup
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Backport of PEP 654 (exception groups)
+  URL:=https://github.com/agronholm/exceptiongroup
+  DEPENDS:= \
+    +python3-light \
+    +python3-attrs
+endef
+
+define Package/python3-exceptiongroup/description
+  This is a backport of the BaseExceptionGroup and ExceptionGroup classes from Python 3.11.
+endef
+
+$(eval $(call Py3Package,python3-exceptiongroup))
+$(eval $(call BuildPackage,python3-exceptiongroup))
+$(eval $(call BuildPackage,python3-exceptiongroup-src))
diff --git a/lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch b/lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch
new file mode 100644
index 000000000..ec2763825
--- /dev/null
+++ b/lang/python/python-exceptiongroup/patches/0001-add-setup.py-to-avoid-depending-on-flit-for-building.patch
@@ -0,0 +1,31 @@
+From 99e590f2177148420f3556bbb0dc2e493e94e45f Mon Sep 17 00:00:00 2001
+From: Julien Malik <julien.malik@paraiso.me>
+Date: Sat, 26 Nov 2022 13:05:20 +0100
+Subject: [PATCH] add setup.py to avoid depending on flit for building
+
+---
+ setup.py | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+ create mode 100644 setup.py
+
+--- /dev/null
++++ b/setup.py
+@@ -0,0 +1,18 @@
++#!/usr/bin/env python
++
++import setuptools
++
++setuptools.setup(
++      name='exceptiongroup',
++      version='1.0.4',
++      description='Backport of PEP 654 (exception groups)',
++      author='Alex Grönholm',
++      author_email='Alex Grönholm <alex.gronholm@nextday.fi>',
++      url='https://github.com/agronholm/exceptiongroup',
++      packages=['exceptiongroup'],
++      package_data={'': ['*']},
++      package_dir={'': 'src'},
++      extras_require={'test': ['pytest >= 6']},
++      python_requires='>=3.7',
++)
++

From 8fe1dab3715197409192fedfedc0b5f6956781f3 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:04 +0100
Subject: [PATCH 06/25] python-async-generator: add package for 1.10

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-async-generator/Makefile | 42 +++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 lang/python/python-async-generator/Makefile

diff --git a/lang/python/python-async-generator/Makefile b/lang/python/python-async-generator/Makefile
new file mode 100644
index 000000000..b3e649032
--- /dev/null
+++ b/lang/python/python-async-generator/Makefile
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-async-generator
+PKG_VERSION:=1.10
+PKG_RELEASE:=1
+
+PYPI_NAME:=async_generator
+PKG_HASH:=6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144
+
+PKG_LICENSE:=Apache-2.0|MIT
+PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-async-generator
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Async generators and context managers for Python 3.5+
+  URL:=https://github.com/python-trio/async_generator
+  DEPENDS:=+python3-light
+endef
+
+define Package/python3-async-generator/description
+  Python 3.6 added async generators. Python 3.7 adds some more tools to make them usable, like contextlib.asynccontextmanager.
+
+  This library gives you all that back to Python 3.5.
+endef
+
+$(eval $(call Py3Package,python3-async-generator))
+$(eval $(call BuildPackage,python3-async-generator))
+$(eval $(call BuildPackage,python3-async-generator-src))

From 750facea90aafb75c5937259671369a83e43881a Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:04 +0100
Subject: [PATCH 07/25] python-outcome: add package for 1.2.0

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-outcome/Makefile | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 lang/python/python-outcome/Makefile

diff --git a/lang/python/python-outcome/Makefile b/lang/python/python-outcome/Makefile
new file mode 100644
index 000000000..05ec24128
--- /dev/null
+++ b/lang/python/python-outcome/Makefile
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-outcome
+PKG_VERSION:=1.2.0
+PKG_RELEASE:=1
+
+PYPI_NAME:=outcome
+PKG_HASH:=6f82bd3de45da303cf1f771ecafa1633750a358436a8bb60e06a1ceb745d2672
+
+PKG_LICENSE:=Apache-2.0|MIT
+PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-outcome
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Capture the outcome of Python function calls.
+  URL:=https://outcome.readthedocs.io
+  DEPENDS:= \
+    +python3-light \
+    +python3-attrs
+endef
+
+define Package/python3-outcome/description
+  Capture the outcome of Python function calls. Extracted from the Trio project.
+endef
+
+$(eval $(call Py3Package,python3-outcome))
+$(eval $(call BuildPackage,python3-outcome))
+$(eval $(call BuildPackage,python3-outcome-src))

From f35f4dace76761048ab43edd91ca6c44123ff6ac Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:04 +0100
Subject: [PATCH 08/25] python-sniffio: add package for 1.3.0

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-sniffio/Makefile | 40 +++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 lang/python/python-sniffio/Makefile

diff --git a/lang/python/python-sniffio/Makefile b/lang/python/python-sniffio/Makefile
new file mode 100644
index 000000000..eef65ad6e
--- /dev/null
+++ b/lang/python/python-sniffio/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-sniffio
+PKG_VERSION:=1.3.0
+PKG_RELEASE:=1
+
+PYPI_NAME:=sniffio
+PKG_HASH:=e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101
+
+PKG_LICENSE:=Apache-2.0|MIT
+PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-sniffio
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Sniff out which async library your code is running under
+  URL:=https://sniffio.readthedocs.io
+  DEPENDS:=+python3-light
+endef
+
+define Package/python3-sniffio/description
+  This is a tiny package whose only purpose is to let you detect which async library your code is running under.
+endef
+
+$(eval $(call Py3Package,python3-sniffio))
+$(eval $(call BuildPackage,python3-sniffio))
+$(eval $(call BuildPackage,python3-sniffio-src))

From 07e29c3782f5eb4fb0e3cc3cdf587c77eafb96e6 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:05 +0100
Subject: [PATCH 09/25] python-trio: add package for 0.22.0

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-trio/Makefile | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 lang/python/python-trio/Makefile

diff --git a/lang/python/python-trio/Makefile b/lang/python/python-trio/Makefile
new file mode 100644
index 000000000..8afd6b29a
--- /dev/null
+++ b/lang/python/python-trio/Makefile
@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-trio
+PKG_VERSION:=0.22.0
+PKG_RELEASE:=1
+
+PYPI_NAME:=trio
+PKG_HASH:=ce68f1c5400a47b137c5a4de72c7c901bd4e7a24fbdebfe9b41de8c6c04eaacf
+
+PKG_LICENSE:=Apache-2.0|MIT
+PKG_LICENSE_FILES:=LICENSE.APACHE2|LICENSE.MIT
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-trio
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=A friendly Python library for async concurrency and I/O
+  URL:=https://trio.readthedocs.io
+  DEPENDS:= \
+    +python3-light \
+    +python3-attrs \
+    +python3-async-generator \
+    +python3-cffi \
+    +python3-exceptiongroup \
+    +python3-idna \
+    +python3-outcome \
+    +python3-sniffio \
+    +python3-sortedcontainers
+endef
+
+define Package/python3-trio/description
+  The Trio project’s goal is to produce a production-quality, permissively licensed, async/await-native I/O library for Python
+endef
+
+$(eval $(call Py3Package,python3-trio))
+$(eval $(call BuildPackage,python3-trio))
+$(eval $(call BuildPackage,python3-trio-src))

From 17f58b94a745a9f058182822d420ed65b3730437 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:05 +0100
Subject: [PATCH 10/25] python-pyfuse3: add package for 3.2.2

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/python-pyfuse3/Makefile | 46 +++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 lang/python/python-pyfuse3/Makefile

diff --git a/lang/python/python-pyfuse3/Makefile b/lang/python/python-pyfuse3/Makefile
new file mode 100644
index 000000000..fd13ccfc0
--- /dev/null
+++ b/lang/python/python-pyfuse3/Makefile
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-pyfuse3
+PKG_VERSION:=3.2.2
+PKG_RELEASE:=1
+
+PYPI_NAME:=pyfuse3
+PKG_HASH:=aa4080913e6148bff1365d4aaacdc96767b87a1e178031fd9caeb5f0b9fc8cec
+
+PKG_LICENSE:=LGPL-2.0-or-later
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/python3-pyfuse3
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Python 3 bindings for libfuse 3 with async I/O support
+  URL:=https://github.com/libfuse/pyfuse3
+  DEPENDS:= \
+    +python3-light \
+    +python3-trio \
+    +libfuse3
+endef
+
+define Package/python3-pyfuse3/description
+  pyfuse3 is a set of Python 3 bindings for libfuse 3.
+
+  It provides an asynchronous API compatible with Trio and asyncio,
+  and enables you to easily write a full-featured Linux filesystem in Python.
+endef
+
+$(eval $(call Py3Package,python3-pyfuse3))
+$(eval $(call BuildPackage,python3-pyfuse3))
+$(eval $(call BuildPackage,python3-pyfuse3-src))

From 2ad61a4529a5f600da47c071bb1bf2ce7462c14c Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sat, 26 Nov 2022 15:24:05 +0100
Subject: [PATCH 11/25] borgbackup: add package for 1.2.2

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
---
 lang/python/borgbackup/Makefile | 63 +++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 lang/python/borgbackup/Makefile

diff --git a/lang/python/borgbackup/Makefile b/lang/python/borgbackup/Makefile
new file mode 100644
index 000000000..8c6a8a924
--- /dev/null
+++ b/lang/python/borgbackup/Makefile
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2022 Julien Malik <julien.malik@paraiso.me>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=borgbackup
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+
+PYPI_NAME:=borgbackup
+PKG_HASH:=d730687443f1beb602b1d72bae36318f6f9654818fcdc50458540ec579e57260
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
+
+include ../pypi.mk
+include $(INCLUDE_DIR)/package.mk
+include ../python3-package.mk
+
+define Package/borgbackup
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  TITLE:=Deduplicated, encrypted, authenticated and compressed backups
+  URL:=https://github.com/borgbackup/borg
+  DEPENDS:= \
+      +python3-light \
+      +python3-msgpack \
+      +python3-pyfuse3 \
+      +libacl \
+      +libopenssl \
+      +liblz4 \
+      +libzstd \
+      +libxxhash
+endef
+
+define Package/borgbackup/description
+  BorgBackup (short: Borg) is a deduplicating backup program.
+  Optionally, it supports compression and authenticated encryption.
+
+  The main goal of Borg is to provide an efficient and secure way to backup data.
+  The data deduplication technique used makes Borg suitable for daily backups since only changes are stored. The authenticated encryption technique makes it suitable for backups to not fully trusted targets.
+endef
+
+HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=Cython
+
+# borg setup.py shall find these via pkg-config, but depends on python pkgconfig PyPi module
+# which quickly becomes a nightmare to build, since it build-depends on poetry which is not
+# available in the python package feed, and has a myriad of deps
+PYTHON3_PKG_SETUP_VARS:= \
+  BORG_OPENSSL_PREFIX="/usr/lib" \
+  BORG_LIBLZ4_PREFIX="/usr/lib" \
+  BORG_LIBZSTD_PREFIX="/usr/lib" \
+  BORG_LIBXXHASH_PREFIX="/usr/lib"
+
+$(eval $(call Py3Package,borgbackup))
+$(eval $(call BuildPackage,borgbackup))
+$(eval $(call BuildPackage,borgbackup-src))

From a157e382df81ba1d40ba275730d7adf627508004 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 22 Nov 2022 16:57:37 +0800
Subject: [PATCH 12/25] librespeed-go: add new package

Go backend for LibreSpeed.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 net/librespeed-go/Makefile                   | 78 +++++++++++++++++++
 net/librespeed-go/files/librespeed-go.config | 47 ++++++++++++
 net/librespeed-go/files/librespeed-go.init   | 80 ++++++++++++++++++++
 3 files changed, 205 insertions(+)
 create mode 100644 net/librespeed-go/Makefile
 create mode 100644 net/librespeed-go/files/librespeed-go.config
 create mode 100644 net/librespeed-go/files/librespeed-go.init

diff --git a/net/librespeed-go/Makefile b/net/librespeed-go/Makefile
new file mode 100644
index 000000000..bb5557b0d
--- /dev/null
+++ b/net/librespeed-go/Makefile
@@ -0,0 +1,78 @@
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=librespeed-go
+PKG_VERSION:=1.1.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/librespeed/speedtest-go/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=a65bbb94868d9ad73f85950264cb18fafb2ba5cf4788ac67981d78b863ca67c4
+
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_LICENSE:=LGPL-3.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/librespeed/speedtest
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+TAR_OPTIONS+= --strip-components 1
+TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+
+define Package/librespeed-go
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=Go backend for LibreSpeed
+  URL:=https://github.com/librespeed/speedtest-go
+  DEPENDS:=$(GO_ARCH_DEPENDS)
+  USERID:=librespeed:librespeed
+endef
+
+define Package/librespeed-go/description
+  No Flash, No Java, No WebSocket, No Bullshit.
+
+  This is a very lightweight speed test implemented in JavaScript,
+  using XMLHttpRequest and Web Workers.
+endef
+
+define Package/librespeed-go/conffiles
+/etc/librespeed-go
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+
+	$(CP) $(PKG_BUILD_DIR)/web/assets/example-singleServer-progressBar.html \
+		$(PKG_BUILD_DIR)/web/assets/index.html
+
+	$(SED) 's,LibreSpeed Example,LibreSpeed for OpenWrt,g' \
+		$(PKG_BUILD_DIR)/web/assets/*.html
+endef
+
+define Package/librespeed-go/install
+	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/speedtest $(1)/usr/bin/librespeed-go
+
+	$(INSTALL_DIR) $(1)/etc/librespeed-go
+	$(CP) $(PKG_BUILD_DIR)/database/mysql/telemetry_mysql.sql $(1)/etc/librespeed-go/
+	$(CP) $(PKG_BUILD_DIR)/database/postgresql/telemetry_postgresql.sql $(1)/etc/librespeed-go/
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(CURDIR)/files/librespeed-go.config $(1)/etc/config/librespeed-go
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(CURDIR)/files/librespeed-go.init $(1)/etc/init.d/librespeed-go
+endef
+
+$(eval $(call GoBinPackage,librespeed-go))
+$(eval $(call BuildPackage,librespeed-go))
diff --git a/net/librespeed-go/files/librespeed-go.config b/net/librespeed-go/files/librespeed-go.config
new file mode 100644
index 000000000..e43dc912a
--- /dev/null
+++ b/net/librespeed-go/files/librespeed-go.config
@@ -0,0 +1,47 @@
+
+config librespeed-go 'config'
+	option enabled '0'
+
+	# bind address, use empty string to bind to all interfaces
+	option bind_address ''
+	# backend listen port
+	option listen_port '8989'
+
+	# change the base URL
+	# option url_base '/librespeed'
+	# proxy protocol port, use 0 to disable
+	option proxyprotocol_port '0'
+	# Server location, use zeroes to fetch from API automatically
+	option server_lat '0'
+	option server_lng '0'
+	# ipinfo.io API key, if applicable
+	option ipinfo_api_key ''
+
+	# assets directory path, defaults to `assets` in the same directory
+	# if the path cannot be found, embedded default assets will be used
+	option assets_path ''
+
+	# password for logging into statistics page, change this to enable stats page
+	# option statistics_password 'PASSWORD'
+	# redact IP addresses (boolean)
+	option redact_ip_addresses '0'
+
+	# database type for statistics data, currently supports: none, memory, bolt, mysql, postgresql
+	# if none is specified, no telemetry/stats will be recorded, and no result PNG will be generated
+	option database_type 'none'
+	# option database_hostname ''
+	# option database_name ''
+	# option database_username ''
+	# option database_password ''
+
+	# if you use `bolt` as database, set database_file to database file location
+	# option database_file '/etc/librespeed-go/speedtest.db'
+
+	# TLS and HTTP/2 settings. TLS is required for HTTP/2 (boolean)
+	option enable_tls '0'
+	option enable_http2 '0'
+
+	# if you use HTTP/2 or TLS, you need to prepare certificates and private keys
+	# option tls_cert_file '/etc/librespeed-go/cert.pem'
+	# option tls_key_file '/etc/librespeed-go/privkey.pem'
+
diff --git a/net/librespeed-go/files/librespeed-go.init b/net/librespeed-go/files/librespeed-go.init
new file mode 100644
index 000000000..484a283db
--- /dev/null
+++ b/net/librespeed-go/files/librespeed-go.init
@@ -0,0 +1,80 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2022 Tianling Shen <cnsztl@immortalwrt.org>
+
+USE_PROCD=1
+START=99
+
+CONF="librespeed-go"
+PROG="/usr/bin/librespeed-go"
+TMPCONF="/var/run/$CONF/settings.json"
+
+start_service() {
+	config_load "$CONF"
+
+	local enabled
+	config_get_bool enabled "config" "enabled" "0"
+	[ "$enabled" -eq "1" ] || return 1
+
+	mkdir -p "${TMPCONF%/*}"
+
+	json_init
+	option_cb() {
+		local name="$1"
+		local value="$2"
+
+		case "$name" in
+		"enabled") ;;
+		"enable_tls"|"enable_http2"|"redact_ip_addresses")
+			json_add_boolean "$name" "$value" ;;
+		*)
+			json_add_string "$name" "$value" ;;
+		esac
+	}
+	config_load "$CONF"
+	json_dump > "$TMPCONF"
+
+	local database_file
+	config_get database_file "config" "database_file"
+	if [ -n "$database_file" ]; then
+		mkdir -p "${database_file%/*}"
+		touch "$database_file"
+		chown librespeed "$database_file"
+	fi
+
+	procd_open_instance "$CONF"
+	procd_set_param command "$PROG"
+	procd_append_param command -c "$TMPCONF"
+
+	procd_set_param limits core="unlimited"
+	procd_set_param limits nofile="1000000 1000000"
+	procd_set_param respawn
+	procd_set_param stderr 1
+	procd_set_param user librespeed
+
+	procd_add_jail "$CONF" log
+	procd_add_jail_mount "$TMPCONF"
+	[ -z "$database_file" ] || procd_add_jail_mount_rw "$database_file"
+
+	local assets_path tls_cert_file tls_key_file
+	config_get assets_path "config" "assets_path"
+	config_get tls_cert_file "config" "tls_cert_file"
+	config_get tls_key_file "config" "tls_key_file"
+	[ -z "$assets_path" ] || procd_add_jail_mount "$assets_path"
+	[ -z "$tls_cert_file" ] || procd_add_jail_mount "$tls_cert_file"
+	[ -z "$tls_key_file" ] || procd_add_jail_mount "$tls_key_file"
+
+	procd_close_instance
+}
+
+stop_service() {
+	rm -rf "${TMPCONF%/*}"
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "$CONF"
+}

From 61d59fd54254b97218aa4e861b1f933d5c5e0bc4 Mon Sep 17 00:00:00 2001
From: Paul Spooren <paul.spooren@rhebo.com>
Date: Wed, 16 Nov 2022 19:06:20 +0100
Subject: [PATCH 13/25] CI: deprecate $(AUTORELEASE) via comments

Autorelease causes some issues like heavy bandwidth usage as well as
non-deterministic package releases whenever someone doesn't use the full
git log.

With this comment all modified packages are checked and if they use
the autorelease feature, kindly comment to the user to change that.

Signed-off-by: Paul Spooren <paul.spooren@rhebo.com>
[ move check to separate workflow to handle ci limitation ]
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 .../check-autorelease-deprecation.yml         | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 .github/workflows/check-autorelease-deprecation.yml

diff --git a/.github/workflows/check-autorelease-deprecation.yml b/.github/workflows/check-autorelease-deprecation.yml
new file mode 100644
index 000000000..c19911bfa
--- /dev/null
+++ b/.github/workflows/check-autorelease-deprecation.yml
@@ -0,0 +1,86 @@
+name: Check autorelease deprecation
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, converted_to_draft, ready_for_review, edited]
+
+jobs:
+  build:
+    name: Check autorelease deprecation
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+    permissions:
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: Determine branch name
+        run: |
+          BRANCH="${GITHUB_BASE_REF#refs/heads/}"
+          echo "Building for $BRANCH"
+          echo "BRANCH=$BRANCH" >> $GITHUB_ENV
+
+      - name: Determine changed packages
+        run: |
+          # only detect packages with changes
+          PKG_ROOTS=$(find . -name Makefile | \
+            grep -v ".*/src/Makefile" | \
+            sed -e 's@./\(.*\)/Makefile@\1/@')
+          CHANGES=$(git diff --diff-filter=d --name-only origin/$BRANCH...)
+
+          for ROOT in $PKG_ROOTS; do
+            for CHANGE in $CHANGES; do
+              if [[ "$CHANGE" == "$ROOT"* ]]; then
+                if grep -q '$(AUTORELEASE)' "$ROOT/Makefile"; then
+                  CONTAINS_AUTORELEASE+="$ROOT"
+                fi
+                break
+              fi
+            done
+          done
+
+          if [ -n "$CONTAINS_AUTORELEASE" ]; then
+            cat > "$GITHUB_WORKSPACE/pr_comment.md" << EOF
+          Please do no longer set *PKG_RELEASE* to *AUTORELEASE* as the
+          feature is deprecated. Please use an integer instead. Below is a
+          list of affected packages including correct *PKG_RELEASE*:
+
+          EOF
+          else
+            echo "No usage of *AUTORELEASE* found in changes" > "$GITHUB_WORKSPACE/pr_comment.md"
+          fi
+
+          for ROOT in $CONTAINS_AUTORELEASE; do
+            echo -n "  - ${ROOT}Makefile: PKG_RELEASE:=" >> "$GITHUB_WORKSPACE/pr_comment.md"
+            last_bump="$(git log --pretty=format:'%h %s' "$ROOT" |
+              grep --max-count=1 -e ': [uU]pdate to ' -e ': [bB]ump to ' |
+              cut -f 1 -d ' ')"
+
+            if [ -n "$last_bump" ]; then
+              echo -n $(($(git rev-list --count "$last_bump..HEAD" "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
+            else
+              echo -n $(($(git rev-list --count HEAD "$ROOT") + 2)) >> "$GITHUB_WORKSPACE/pr_comment.md"
+            fi
+            echo >> "$GITHUB_WORKSPACE/pr_comment.md"
+          done
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+
+      - name: Create or update comment
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-file: 'pr_comment.md'
+          edit-mode: replace

From bda5a9981556e33e46edc4e738b7b3d36f6ce3a1 Mon Sep 17 00:00:00 2001
From: Glen Huang <i@glenhuang.com>
Date: Sun, 20 Nov 2022 01:26:44 +0800
Subject: [PATCH 14/25] acme: ensure symlinks for renewed certificates

Signed-off-by: Glen Huang <i@glenhuang.com>
---
 net/acme-acmesh/Makefile      |  2 +-
 net/acme-acmesh/files/hook.sh | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/net/acme-acmesh/Makefile b/net/acme-acmesh/Makefile
index fdcf1df24..0a198cc52 100644
--- a/net/acme-acmesh/Makefile
+++ b/net/acme-acmesh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-acmesh
 PKG_VERSION:=3.0.1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=9
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
diff --git a/net/acme-acmesh/files/hook.sh b/net/acme-acmesh/files/hook.sh
index 89c61a58e..4df82643d 100644
--- a/net/acme-acmesh/files/hook.sh
+++ b/net/acme-acmesh/files/hook.sh
@@ -45,6 +45,20 @@ get)
 
 			case $status in
 			0)
+				mkdir -p /etc/ssl/acme
+				if [ ! -e "/etc/ssl/acme/$main_domain.crt" ]; then
+					ln -s "$domain_dir/$main_domain.cer" "/etc/ssl/acme/$main_domain.crt"
+				fi
+				if [ ! -e "/etc/ssl/acme/$main_domain.key" ]; then
+					ln -s "$domain_dir/$main_domain.key" "/etc/ssl/acme/$main_domain.key"
+				fi
+				if [ ! -e "/etc/ssl/acme/$main_domain.fullchain.crt" ]; then
+					ln -s "$domain_dir/fullchain.cer" "/etc/ssl/acme/$main_domain.fullchain.crt"
+				fi
+				if [ ! -e "/etc/ssl/acme/$main_domain.chain.crt" ]; then
+					ln -s "$domain_dir/ca.cer" "/etc/ssl/acme/$main_domain.chain.crt"
+				fi
+
 				$NOTIFY renewed
 				exit
 				;;
@@ -111,7 +125,7 @@ get)
 	case $status in
 	0)
 		ln -s "$domain_dir/$main_domain.cer" "/etc/ssl/acme/$main_domain.crt"
-		ln -s "$domain_dir/$main_domain.key" /etc/ssl/acme
+		ln -s "$domain_dir/$main_domain.key" "/etc/ssl/acme/$main_domain.key"
 		ln -s "$domain_dir/fullchain.cer" "/etc/ssl/acme/$main_domain.fullchain.crt"
 		ln -s "$domain_dir/ca.cer" "/etc/ssl/acme/$main_domain.chain.crt"
 		$NOTIFY issued

From 056051da496078ebaa45d25d6fe6cbb392a60ec1 Mon Sep 17 00:00:00 2001
From: Michael Heimpold <mhei@heimpold.de>
Date: Mon, 28 Nov 2022 07:43:50 +0100
Subject: [PATCH 15/25] php8: update to 8.1.13

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
---
 lang/php8/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/php8/Makefile b/lang/php8/Makefile
index b71c5c8a9..e9d00c72a 100644
--- a/lang/php8/Makefile
+++ b/lang/php8/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
-PKG_VERSION:=8.1.12
+PKG_VERSION:=8.1.13
 PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
@@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=08243359e2204d842082269eedc15f08d2eca726d0e65b93fb11f4bfc51bbbab
+PKG_HASH:=b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856
 
 PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0

From e04e523a01f5144a60541e6468a9f4451f26c8ab Mon Sep 17 00:00:00 2001
From: Liangbin Lian <jjm2473@gmail.com>
Date: Thu, 24 Nov 2022 18:05:50 +0800
Subject: [PATCH 16/25] samba4: support both user map and valid users on same
 time

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
---
 net/samba4/files/samba.init | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/samba4/files/samba.init b/net/samba4/files/samba.init
index b849a1cd3..468ba553a 100644
--- a/net/samba4/files/samba.init
+++ b/net/samba4/files/samba.init
@@ -115,9 +115,8 @@ smb_add_share() {
 		if [ "$force_root" -eq 1 ]; then
 			printf "\tforce user = root\n"
 			printf "\tforce group = root\n"
-		else
-			[ -n "$users" ] && printf "\tvalid users = %s\n" "$users"
 		fi
+		[ -n "$users" ] && printf "\tvalid users = %s\n" "$users"
 
 		[ -n "$create_mask" ] && printf "\tcreate mask = %s\n" "$create_mask"
 		[ -n "$dir_mask" ] && printf "\tdirectory mask = %s\n" "$dir_mask"

From 1890f35cfd4127fb533eaa56b3370a88bd62f703 Mon Sep 17 00:00:00 2001
From: Glen Huang <i@glenhuang.com>
Date: Sat, 19 Nov 2022 10:22:46 +0800
Subject: [PATCH 17/25] haproxy: use .crt as extension for certificates

Signed-off-by: Glen Huang <i@glenhuang.com>
---
 net/haproxy/Makefile           | 2 +-
 net/haproxy/files/acme.hotplug | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 6d2d2099c..179658361 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
 PKG_VERSION:=2.6.6
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=103
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src
diff --git a/net/haproxy/files/acme.hotplug b/net/haproxy/files/acme.hotplug
index 726d2b216..9896bbdee 100644
--- a/net/haproxy/files/acme.hotplug
+++ b/net/haproxy/files/acme.hotplug
@@ -1,8 +1,8 @@
 case $ACTION in
 issued|renewed)
 	cat \
-		"/etc/ssl/acme/$main_domain.fullchain.cer" \
+		"/etc/ssl/acme/$main_domain.fullchain.crt" \
 		"/etc/ssl/acme/$main_domain.key" \
-		>"/etc/ssl/acme/$main_domain.combined.cer"
+		>"/etc/ssl/acme/$main_domain.combined.crt"
 	;;
 esac

From 255d19a007ab9a0dbefab88f0be934f6cffe5ed5 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 29 Nov 2022 00:18:21 +0800
Subject: [PATCH 18/25] yq: Update to 4.30.5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 utils/yq/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/yq/Makefile b/utils/yq/Makefile
index 9c3ab3fc4..4bfa4d96b 100644
--- a/utils/yq/Makefile
+++ b/utils/yq/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=yq
-PKG_VERSION:=4.30.4
+PKG_VERSION:=4.30.5
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=d46e4f5176d6115107909623bd89ceb7ae991acc0980112ba9b0159811229c0c
+PKG_HASH:=54706926e44ca8f28c74c0165c4746f372daafd4db885b709fdaf5e8f2e4502c
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MIT

From b3e453f33517747ef9fb48536cced4e42f7abc99 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 29 Nov 2022 00:19:15 +0800
Subject: [PATCH 19/25] xray-core: Update to 1.6.5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 net/xray-core/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile
index 5436db2d6..e231bc796 100644
--- a/net/xray-core/Makefile
+++ b/net/xray-core/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xray-core
-PKG_VERSION:=1.6.4
+PKG_VERSION:=1.6.5
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=8f81aecb5c28585c98ea95e563d2f03a7d21daa333778f9c4f0aeed27afacef4
+PKG_HASH:=61956d8d72d086fbf83e6a3aff191d010401aca34f30015f839f8a73bf50914c
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 PKG_LICENSE:=MPL-2.0

From 664ecae4e6379928aae0527b96b65ffe0199049d Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 29 Nov 2022 00:22:24 +0800
Subject: [PATCH 20/25] v2ray-geodata: Update to latest version

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 net/v2ray-geodata/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile
index 077f31f56..c441ce1f4 100644
--- a/net/v2ray-geodata/Makefile
+++ b/net/v2ray-geodata/Makefile
@@ -5,29 +5,29 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2ray-geodata
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202211100058
+GEOIP_VER:=202211240054
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
   URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
   URL_FILE:=geoip.dat
   FILE:=$(GEOIP_FILE)
-  HASH:=1951b20418a48ad8d13f72a1adb1e3cf8540967b15342ff81c7c9bed325a6874
+  HASH:=567c9a1bfe22c2ff7f468f3814aa6bb344b33393cf39507e5cbeb20c78c952b7
 endef
 
-GEOSITE_VER:=20221110023640
+GEOSITE_VER:=20221127082021
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=35a868eb49173137b23e36948a6e6874f4380e84c4d569a8f4d6f220f78c1edc
+  HASH:=519583c593fada6cf8d629eb428652199ab715d641073f64122c1e2c68b6c43f
 endef
 
 define Package/v2ray-geodata/template

From 17362ce57c88da583c039d81b800b3edad5a6053 Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 29 Nov 2022 02:32:01 +0800
Subject: [PATCH 21/25] v2raya: backports upstream fixes and add 3 new options

It may take a long time waiting for a new tag, so backport these
important bug fixes for now.

While at it, added 3 new options provided by upstream, and deprecated
the usage of `$(AUTORELEASE)`.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 net/v2raya/Makefile                           |   2 +-
 net/v2raya/files/v2raya.config                |  13 +
 net/v2raya/files/v2raya.init                  |   3 +
 .../010-fixed-for-Docker-Compose.patch        |  46 +++
 net/v2raya/patches/011-cleaned-up.patch       |  37 ++
 net/v2raya/patches/012-improved.patch         |  38 ++
 ...-interface-ppp-to-avoid-to-break-net.patch |  38 ++
 ...ad-from-vless-sharing-link-and-add-m.patch | 105 ++++++
 ...that-supervisor-cannot-exit-normally.patch | 100 ++++++
 ...ected-exit-does-not-apply-stop-steps.patch |  52 +++
 .../017-optimize-reduce-disk-writes.patch     | 336 ++++++++++++++++++
 ...x-do-not-rollback-closed-transaction.patch |  27 ++
 12 files changed, 796 insertions(+), 1 deletion(-)
 create mode 100644 net/v2raya/patches/010-fixed-for-Docker-Compose.patch
 create mode 100644 net/v2raya/patches/011-cleaned-up.patch
 create mode 100644 net/v2raya/patches/012-improved.patch
 create mode 100644 net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch
 create mode 100644 net/v2raya/patches/014-fix-seed-cannot-be-read-from-vless-sharing-link-and-add-m.patch
 create mode 100644 net/v2raya/patches/015-fix-a-problem-that-supervisor-cannot-exit-normally.patch
 create mode 100644 net/v2raya/patches/016-fix-unexpected-exit-does-not-apply-stop-steps.patch
 create mode 100644 net/v2raya/patches/017-optimize-reduce-disk-writes.patch
 create mode 100644 net/v2raya/patches/018-fix-do-not-rollback-closed-transaction.patch

diff --git a/net/v2raya/Makefile b/net/v2raya/Makefile
index 7f643501a..17ab5e01c 100644
--- a/net/v2raya/Makefile
+++ b/net/v2raya/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=v2rayA
 PKG_VERSION:=1.5.9.1698.1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
diff --git a/net/v2raya/files/v2raya.config b/net/v2raya/files/v2raya.config
index fbda47431..d9ff36581 100644
--- a/net/v2raya/files/v2raya.config
+++ b/net/v2raya/files/v2raya.config
@@ -31,6 +31,19 @@ config v2raya 'config'
 	# Additional v2ray config directory, files in it will be combined with config generated by v2rayA
 	option v2ray_confdir ''
 
+	# The executable file to run in the transparent proxy life-cycle.
+	# v2rayA will pass in the --transparent-type (tproxy, redirect)
+	#   and --stage (pre-start, post-start, pre-stop, post-stop) arguments.
+	option transparent_hook ''
+
+	# The executable file to run in the v2ray-core life-cycle.
+	# v2rayA will pass in the --stage (pre-start, post-start, pre-stop, post-stop) argument.
+	option core_hook ''
+
+	# The executable file to run in the v2ray-core life-cycle.
+	# v2rayA will pass in the --stage (pre-start, post-start, pre-stop, post-stop) argument.
+	option plugin_manager ''
+
 	# Specify the certification path instead of automatically generating a self-signed certificate.
 	# Example: /etc/v2raya/grpc_certificate.crt,/etc/v2raya/grpc_private.key
 	option vless_grpc_inbound_cert_key ''
diff --git a/net/v2raya/files/v2raya.init b/net/v2raya/files/v2raya.init
index 9c207f7d9..4120e90ff 100755
--- a/net/v2raya/files/v2raya.init
+++ b/net/v2raya/files/v2raya.init
@@ -48,6 +48,9 @@ start_service() {
 	append_env_arg "config" "log_max_days" "3"
 	append_env_arg "config" "v2ray_bin"
 	append_env_arg "config" "v2ray_confdir"
+	append_env_arg "config" "transparent_hook"
+	append_env_arg "config" "core_hook"
+	append_env_arg "config" "plugin_manager"
 	append_env_arg "config" "vless_grpc_inbound_cert_key"
 	append_env_bool "config" "log_disable_color"
 	append_env_bool "config" "log_disable_timestamp"
diff --git a/net/v2raya/patches/010-fixed-for-Docker-Compose.patch b/net/v2raya/patches/010-fixed-for-Docker-Compose.patch
new file mode 100644
index 000000000..8461660f7
--- /dev/null
+++ b/net/v2raya/patches/010-fixed-for-Docker-Compose.patch
@@ -0,0 +1,46 @@
+From 78336e55a31db578c139a5bb472aa0fc219c169d Mon Sep 17 00:00:00 2001
+From: Xiaoxu Guo <ftiasch0@gmail.com>
+Date: Thu, 4 Aug 2022 16:24:04 +0800
+Subject: [PATCH] fixed for Docker Compose
+
+---
+ service/core/iptables/tproxy.go | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/core/iptables/tproxy.go
++++ b/core/iptables/tproxy.go
+@@ -65,6 +65,7 @@ iptables -w 2 -t mangle -A TP_PRE -p udp
+ 
+ iptables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
+ iptables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
++iptables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
+ iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
+ `
+@@ -123,6 +124,8 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud
+ 
+ ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
+ ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
++ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
++ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
+ `
+@@ -156,7 +159,7 @@ ip6tables -w 2 -t mangle -A TP_MARK -j C
+ 
+ func (t *tproxy) GetCleanCommands() Setter {
+ 	commands := `
+-ip rule del fwmark 0x40/0xc0 table 100 
++ip rule del fwmark 0x40/0xc0 table 100
+ ip route del local 0.0.0.0/0 dev lo table 100
+ 
+ iptables -w 2 -t mangle -F TP_OUT
+@@ -172,7 +175,7 @@ iptables -w 2 -t mangle -X TP_MARK
+ `
+ 	if IsIPv6Supported() {
+ 		commands += `
+-ip -6 rule del fwmark 0x40/0xc0 table 100 
++ip -6 rule del fwmark 0x40/0xc0 table 100
+ ip -6 route del local ::/0 dev lo table 100
+ 
+ ip6tables -w 2 -t mangle -F TP_OUT
diff --git a/net/v2raya/patches/011-cleaned-up.patch b/net/v2raya/patches/011-cleaned-up.patch
new file mode 100644
index 000000000..74dc502ec
--- /dev/null
+++ b/net/v2raya/patches/011-cleaned-up.patch
@@ -0,0 +1,37 @@
+From 0db405f50fd652d494f2066fc5e47c41666c96db Mon Sep 17 00:00:00 2001
+From: Xiaoxu Guo <ftiasch0@gmail.com>
+Date: Thu, 4 Aug 2022 16:32:42 +0800
+Subject: [PATCH] cleaned up
+
+---
+ service/core/iptables/tproxy.go | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/core/iptables/tproxy.go
++++ b/core/iptables/tproxy.go
+@@ -124,7 +124,6 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud
+ 
+ ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
+ ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
+-ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
+@@ -159,7 +158,7 @@ ip6tables -w 2 -t mangle -A TP_MARK -j C
+ 
+ func (t *tproxy) GetCleanCommands() Setter {
+ 	commands := `
+-ip rule del fwmark 0x40/0xc0 table 100
++ip rule del fwmark 0x40/0xc0 table 100 
+ ip route del local 0.0.0.0/0 dev lo table 100
+ 
+ iptables -w 2 -t mangle -F TP_OUT
+@@ -175,7 +174,7 @@ iptables -w 2 -t mangle -X TP_MARK
+ `
+ 	if IsIPv6Supported() {
+ 		commands += `
+-ip -6 rule del fwmark 0x40/0xc0 table 100
++ip -6 rule del fwmark 0x40/0xc0 table 100 
+ ip -6 route del local ::/0 dev lo table 100
+ 
+ ip6tables -w 2 -t mangle -F TP_OUT
diff --git a/net/v2raya/patches/012-improved.patch b/net/v2raya/patches/012-improved.patch
new file mode 100644
index 000000000..1c755d015
--- /dev/null
+++ b/net/v2raya/patches/012-improved.patch
@@ -0,0 +1,38 @@
+From 4a87a6fc9a17939cc0fc54058b2128b1f688045a Mon Sep 17 00:00:00 2001
+From: Xiaoxu Guo <ftiasch0@gmail.com>
+Date: Thu, 4 Aug 2022 22:56:46 +0800
+Subject: [PATCH] improved
+
+---
+ service/core/iptables/tproxy.go | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/core/iptables/tproxy.go
++++ b/core/iptables/tproxy.go
+@@ -16,7 +16,7 @@ var Tproxy tproxy
+ func (t *tproxy) AddIPWhitelist(cidr string) {
+ 	// avoid duplication
+ 	t.RemoveIPWhitelist(cidr)
+-	pos := 5
++	pos := 6
+ 	if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed {
+ 		pos += 3
+ 	}
+@@ -65,7 +65,7 @@ iptables -w 2 -t mangle -A TP_PRE -p udp
+ 
+ iptables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
+ iptables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
+-iptables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
++iptables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN
+ iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
+ `
+@@ -124,7 +124,7 @@ ip6tables -w 2 -t mangle -A TP_PRE -p ud
+ 
+ ip6tables -w 2 -t mangle -A TP_RULE -j CONNMARK --restore-mark
+ ip6tables -w 2 -t mangle -A TP_RULE -m mark --mark 0x40/0xc0 -j RETURN
+-ip6tables -w 2 -t mangle -A TP_RULE -i br+ -j RETURN
++ip6tables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
+ `
diff --git a/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch b/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch
new file mode 100644
index 000000000..0ff5f6a54
--- /dev/null
+++ b/net/v2raya/patches/013-fix-we-should-skip-interface-ppp-to-avoid-to-break-net.patch
@@ -0,0 +1,38 @@
+From ca6a05273284daa04856a840e64f3936f700b7c3 Mon Sep 17 00:00:00 2001
+From: mzz2017 <mzz@tuta.io>
+Date: Fri, 16 Sep 2022 15:13:11 +0800
+Subject: [PATCH] fix: we should skip interface ppp+ to avoid to break net
+
+---
+ service/core/iptables/tproxy.go | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/core/iptables/tproxy.go
++++ b/core/iptables/tproxy.go
+@@ -16,7 +16,7 @@ var Tproxy tproxy
+ func (t *tproxy) AddIPWhitelist(cidr string) {
+ 	// avoid duplication
+ 	t.RemoveIPWhitelist(cidr)
+-	pos := 6
++	pos := 8
+ 	if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed {
+ 		pos += 3
+ 	}
+@@ -68,6 +68,8 @@ iptables -w 2 -t mangle -A TP_RULE -m ma
+ iptables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN
+ iptables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ iptables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
++iptables -w 2 -t mangle -A TP_RULE -i ppp+ -j RETURN
++iptables -w 2 -t mangle -A TP_RULE -i dn42-+ -j RETURN
+ `
+ 	if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed {
+ 		commands += `
+@@ -127,6 +129,8 @@ ip6tables -w 2 -t mangle -A TP_RULE -m m
+ ip6tables -w 2 -t mangle -A TP_RULE -i br-+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i docker+ -j RETURN
+ ip6tables -w 2 -t mangle -A TP_RULE -i veth+ -j RETURN
++ip6tables -w 2 -t mangle -A TP_RULE -i ppp+ -j RETURN
++ip6tables -w 2 -t mangle -A TP_RULE -i dn42-+ -j RETURN
+ `
+ 		if configure.GetSettingNotNil().AntiPollution != configure.AntipollutionClosed {
+ 			commands += `
diff --git a/net/v2raya/patches/014-fix-seed-cannot-be-read-from-vless-sharing-link-and-add-m.patch b/net/v2raya/patches/014-fix-seed-cannot-be-read-from-vless-sharing-link-and-add-m.patch
new file mode 100644
index 000000000..ba5030624
--- /dev/null
+++ b/net/v2raya/patches/014-fix-seed-cannot-be-read-from-vless-sharing-link-and-add-m.patch
@@ -0,0 +1,105 @@
+From 5db722b22b39642280572a62b149d4e1efa21ce3 Mon Sep 17 00:00:00 2001
+From: mzz2017 <mzz@tuta.io>
+Date: Mon, 8 Aug 2022 22:30:36 +0800
+Subject: [PATCH] fix: seed cannot be read from vless sharing-link and add
+ missing sni field. #616
+
+---
+ service/core/serverObj/v2ray.go | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+--- a/core/serverObj/v2ray.go
++++ b/core/serverObj/v2ray.go
+@@ -12,7 +12,6 @@ import (
+ 	"time"
+ 
+ 	jsoniter "github.com/json-iterator/go"
+-	"github.com/tidwall/gjson"
+ 	"github.com/v2rayA/v2rayA/common"
+ 	"github.com/v2rayA/v2rayA/core/coreObj"
+ 	"github.com/v2rayA/v2rayA/core/v2ray/service"
+@@ -39,6 +38,7 @@ type V2Ray struct {
+ 	Net           string `json:"net"`
+ 	Type          string `json:"type"`
+ 	Host          string `json:"host"`
++	SNI           string `json:"sni"`
+ 	Path          string `json:"path"`
+ 	TLS           string `json:"tls"`
+ 	Flow          string `json:"flow,omitempty"`
+@@ -69,7 +69,8 @@ func ParseVlessURL(vless string) (data *
+ 		ID:            u.User.String(),
+ 		Net:           u.Query().Get("type"),
+ 		Type:          u.Query().Get("headerType"),
+-		Host:          u.Query().Get("sni"),
++		Host:          u.Query().Get("host"),
++		SNI:           u.Query().Get("sni"),
+ 		Path:          u.Query().Get("path"),
+ 		TLS:           u.Query().Get("security"),
+ 		Flow:          u.Query().Get("flow"),
+@@ -86,16 +87,13 @@ func ParseVlessURL(vless string) (data *
+ 	if data.Type == "" {
+ 		data.Type = "none"
+ 	}
+-	if data.Host == "" {
+-		data.Host = u.Query().Get("host")
+-	}
+ 	if data.TLS == "" {
+ 		data.TLS = "none"
+ 	}
+ 	if data.Flow == "" {
+ 		data.Flow = "xtls-rprx-direct"
+ 	}
+-	if data.Type == "mkcp" || data.Type == "kcp" {
++	if data.Net == "mkcp" || data.Net == "kcp" {
+ 		data.Path = u.Query().Get("seed")
+ 	}
+ 	return data, nil
+@@ -145,6 +143,7 @@ func ParseVmessURL(vmess string) (data *
+ 		if aid == "" {
+ 			aid = q.Get("aid")
+ 		}
++		sni := q.Get("sni")
+ 		info = V2Ray{
+ 			ID:            subMatch[1],
+ 			Add:           subMatch[2],
+@@ -152,6 +151,7 @@ func ParseVmessURL(vmess string) (data *
+ 			Ps:            ps,
+ 			Host:          obfsParam,
+ 			Path:          path,
++			SNI:           sni,
+ 			Net:           obfs,
+ 			Aid:           aid,
+ 			TLS:           map[string]string{"1": "tls"}[q.Get("tls")],
+@@ -165,12 +165,6 @@ func ParseVmessURL(vmess string) (data *
+ 		if err != nil {
+ 			return
+ 		}
+-		if info.Host == "" {
+-			sni := gjson.Get(raw, "sni")
+-			if sni.Exists() {
+-				info.Host = sni.String()
+-			}
+-		}
+ 	}
+ 	// correct the wrong vmess as much as possible
+ 	if strings.HasPrefix(info.Host, "/") && info.Path == "" {
+@@ -328,7 +322,9 @@ func (v *V2Ray) Configuration(info Prior
+ 				core.StreamSettings.TLSSettings.AllowInsecure = true
+ 			}
+ 			// SNI
+-			if v.Host != "" {
++			if v.SNI != "" {
++				core.StreamSettings.TLSSettings.ServerName = v.SNI
++			} else if v.Host != "" {
+ 				core.StreamSettings.TLSSettings.ServerName = v.Host
+ 			}
+ 			// Alpn
+@@ -345,6 +341,8 @@ func (v *V2Ray) Configuration(info Prior
+ 			// SNI
+ 			if v.Host != "" {
+ 				core.StreamSettings.XTLSSettings.ServerName = v.Host
++			} else if v.Host != "" {
++				core.StreamSettings.TLSSettings.ServerName = v.Host
+ 			}
+ 			if v.AllowInsecure {
+ 				core.StreamSettings.XTLSSettings.AllowInsecure = true
diff --git a/net/v2raya/patches/015-fix-a-problem-that-supervisor-cannot-exit-normally.patch b/net/v2raya/patches/015-fix-a-problem-that-supervisor-cannot-exit-normally.patch
new file mode 100644
index 000000000..5447dc0f9
--- /dev/null
+++ b/net/v2raya/patches/015-fix-a-problem-that-supervisor-cannot-exit-normally.patch
@@ -0,0 +1,100 @@
+From 3f78422f81f3abc2668fc3938b31d213bfe4dfff Mon Sep 17 00:00:00 2001
+From: mzz2017 <mzz@tuta.io>
+Date: Sun, 28 Aug 2022 17:54:36 +0800
+Subject: [PATCH] fix: a problem that supervisor cannot exit normally
+
+---
+ service/core/specialMode/infra/handle.go     | 11 ++++++----
+ service/core/specialMode/infra/supervisor.go | 22 ++++++++------------
+ 2 files changed, 16 insertions(+), 17 deletions(-)
+
+--- a/core/specialMode/infra/handle.go
++++ b/core/specialMode/infra/handle.go
+@@ -127,10 +127,13 @@ func (interfaceHandle *handle) handleRec
+ 	return results, msg
+ }
+ 
+-func packetFilter(portCache *portCache, pPacket *gopacket.Packet, whitelistDnsServers *v2router.GeoIPMatcher) (m *dnsmessage.Message, pSAddr, pSPort, pDAddr, pDPort *gopacket.Endpoint) {
+-	packet := *pPacket
+-	trans := packet.TransportLayer()
++func packetFilter(portCache *portCache, packet gopacket.Packet, whitelistDnsServers *v2router.GeoIPMatcher) (m *dnsmessage.Message, pSAddr, pSPort, pDAddr, pDPort *gopacket.Endpoint) {
++	//跳过非网络层的包
++	if packet.NetworkLayer() == nil {
++		return
++	}
+ 	//跳过非传输层的包
++	trans := packet.TransportLayer()
+ 	if trans == nil {
+ 		return
+ 	}
+@@ -180,7 +183,7 @@ func packetFilter(portCache *portCache,
+ }
+ 
+ func (interfaceHandle *handle) handlePacket(packet gopacket.Packet, ifname string, whitelistDnsServers *v2router.GeoIPMatcher, whitelistDomains *strmatcher.MatcherGroup) {
+-	m, sAddr, sPort, dAddr, dPort := packetFilter(interfaceHandle.portCache, &packet, whitelistDnsServers)
++	m, sAddr, sPort, dAddr, dPort := packetFilter(interfaceHandle.portCache, packet, whitelistDnsServers)
+ 	if m == nil {
+ 		return
+ 	}
+--- a/core/specialMode/infra/supervisor.go
++++ b/core/specialMode/infra/supervisor.go
+@@ -9,7 +9,6 @@ import (
+ 	v2router "github.com/v2rayA/v2ray-lib/router"
+ 	"github.com/v2rayA/v2rayA/pkg/util/log"
+ 	"sync"
+-	"time"
+ )
+ 
+ type DnsSupervisor struct {
+@@ -70,7 +69,7 @@ func (d *DnsSupervisor) DeleteHandles(if
+ 	}
+ 	close(d.handles[ifname].done)
+ 	delete(d.handles, ifname)
+-	log.Trace("DnsSupervisor:%v closed", ifname)
++	log.Trace("DnsSupervisor:%v deleted", ifname)
+ 	return
+ }
+ 
+@@ -81,28 +80,24 @@ func (d *DnsSupervisor) Run(ifname strin
+ 	d.inner.Lock()
+ 	handle, ok := d.handles[ifname]
+ 	if !ok {
++		d.inner.Unlock()
+ 		return fmt.Errorf("Run: %v not exsits", ifname)
+ 	}
+ 	if handle.running {
++		d.inner.Unlock()
+ 		return fmt.Errorf("Run: %v is running", ifname)
+ 	}
+ 	handle.running = true
+ 	log.Trace("[DnsSupervisor] " + ifname + ": running")
+-	pkgsrc := gopacket.NewPacketSource(handle, layers.LayerTypeEthernet)
++	// we only decode UDP packets
++	pkgsrc := gopacket.NewPacketSource(handle, layers.LayerTypeDNS)
+ 	pkgsrc.NoCopy = true
++	//pkgsrc.Lazy = true
+ 	d.inner.Unlock()
+ 	packets := pkgsrc.Packets()
+ 	go func() {
+-		for {
+-			//心跳包，防止内存泄漏
+-			packets <- gopacket.NewPacket(nil, layers.LinkTypeEthernet, gopacket.DecodeOptions{})
+-			select {
+-			case <-handle.done:
+-				return
+-			default:
+-				time.Sleep(2 * time.Second)
+-			}
+-		}
++		<-handle.done
++		packets <- gopacket.NewPacket(nil, layers.LinkTypeEthernet, pkgsrc.DecodeOptions)
+ 	}()
+ out:
+ 	for packet := range packets {
+@@ -113,5 +108,6 @@ out:
+ 		}
+ 		go handle.handlePacket(packet, ifname, whitelistDnsServers, whitelistDomains)
+ 	}
++	log.Trace("DnsSupervisor:%v closed", ifname)
+ 	return
+ }
diff --git a/net/v2raya/patches/016-fix-unexpected-exit-does-not-apply-stop-steps.patch b/net/v2raya/patches/016-fix-unexpected-exit-does-not-apply-stop-steps.patch
new file mode 100644
index 000000000..a945dbdeb
--- /dev/null
+++ b/net/v2raya/patches/016-fix-unexpected-exit-does-not-apply-stop-steps.patch
@@ -0,0 +1,52 @@
+From 153b72ed623876ad73b731c2ec2344e9057d3c35 Mon Sep 17 00:00:00 2001
+From: mzz2017 <mzz@tuta.io>
+Date: Wed, 21 Sep 2022 16:50:24 +0800
+Subject: [PATCH] fix: unexpected exit does not apply stop steps
+
+---
+ service/core/v2ray/process.go        | 4 ++--
+ service/core/v2ray/processManager.go | 8 +++-----
+ 2 files changed, 5 insertions(+), 7 deletions(-)
+
+--- a/core/v2ray/process.go
++++ b/core/v2ray/process.go
+@@ -35,7 +35,7 @@ type Process struct {
+ 	tag2WhichIndex map[string]int
+ }
+ 
+-func NewProcess(tmpl *Template, prestart func() error, poststart func() error) (process *Process, err error) {
++func NewProcess(tmpl *Template, prestart func() error, poststart func() error, stopfunc func(p *Process)) (process *Process, err error) {
+ 	process = &Process{
+ 		template: tmpl,
+ 	}
+@@ -111,7 +111,7 @@ func NewProcess(tmpl *Template, prestart
+ 			// canceled by v2rayA
+ 			return
+ 		}
+-		defer ProcessManager.Stop(false)
++		defer stopfunc(process)
+ 		var t []string
+ 		if p != nil {
+ 			if p.Success() {
+--- a/core/v2ray/processManager.go
++++ b/core/v2ray/processManager.go
+@@ -245,16 +245,14 @@ func (m *CoreProcessManager) Start(t *Te
+ 		return m.beforeStart(t)
+ 	}, func() error {
+ 		return m.afterStart(t)
++	}, func(p *Process) {
++		m.p = p
++		ProcessManager.Stop(false)
+ 	})
+ 	if err != nil {
+ 		return err
+ 	}
+ 	m.p = process
+-	defer func() {
+-		if err != nil {
+-			m.stop(true)
+-		}
+-	}()
+ 
+ 	configure.SetRunning(true)
+ 	return nil
diff --git a/net/v2raya/patches/017-optimize-reduce-disk-writes.patch b/net/v2raya/patches/017-optimize-reduce-disk-writes.patch
new file mode 100644
index 000000000..5437570c9
--- /dev/null
+++ b/net/v2raya/patches/017-optimize-reduce-disk-writes.patch
@@ -0,0 +1,336 @@
+From 00366b224b2e28861b80f677e8aa604c5d08dae3 Mon Sep 17 00:00:00 2001
+From: Kelo <meetkelo@outlook.com>
+Date: Sat, 29 Oct 2022 16:27:26 +0800
+Subject: [PATCH] optimize: reduce disk writes
+
+---
+ service/db/boltdb.go  | 43 +++++++++++++++++++++++++++++++----
+ service/db/listOp.go  | 48 +++++++++++++++++++++------------------
+ service/db/plainOp.go | 52 ++++++++++++++++++++++++-------------------
+ service/db/setOp.go   | 20 +++++++++--------
+ 4 files changed, 105 insertions(+), 58 deletions(-)
+
+--- a/db/boltdb.go
++++ b/db/boltdb.go
+@@ -1,13 +1,14 @@
+ package db
+ 
+ import (
+-	"go.etcd.io/bbolt"
+-	"github.com/v2rayA/v2rayA/conf"
+-	"github.com/v2rayA/v2rayA/pkg/util/copyfile"
+-	"github.com/v2rayA/v2rayA/pkg/util/log"
+ 	"os"
+ 	"path/filepath"
+ 	"sync"
++
++	"github.com/v2rayA/v2rayA/conf"
++	"github.com/v2rayA/v2rayA/pkg/util/copyfile"
++	"github.com/v2rayA/v2rayA/pkg/util/log"
++	"go.etcd.io/bbolt"
+ )
+ 
+ var once sync.Once
+@@ -46,3 +47,37 @@ func DB() *bbolt.DB {
+ 	once.Do(initDB)
+ 	return db
+ }
++
++// The function should return a dirty flag.
++// If the dirty flag is true and there is no error then the transaction is commited.
++// Otherwise, the transaction is rolled back.
++func Transaction(db *bbolt.DB, fn func(*bbolt.Tx) (bool, error)) error {
++	tx, err := db.Begin(true)
++	if err != nil {
++		return err
++	}
++	defer tx.Rollback()
++	dirty, err := fn(tx)
++	if err != nil {
++		_ = tx.Rollback()
++		return err
++	}
++	if !dirty {
++		return nil
++	}
++	return tx.Commit()
++}
++
++// If the bucket does not exist, the dirty flag is setted
++func CreateBucketIfNotExists(tx *bbolt.Tx, name []byte, dirty *bool) (*bbolt.Bucket, error) {
++	bkt := tx.Bucket(name)
++	if bkt != nil {
++		return bkt, nil
++	}
++	bkt, err := tx.CreateBucket(name)
++	if err != nil {
++		return nil, err
++	}
++	*dirty = true
++	return bkt, nil
++}
+--- a/db/listOp.go
++++ b/db/listOp.go
+@@ -2,13 +2,14 @@ package db
+ 
+ import (
+ 	"fmt"
+-	"go.etcd.io/bbolt"
+-	jsoniter "github.com/json-iterator/go"
+-	"github.com/tidwall/gjson"
+-	"github.com/tidwall/sjson"
+ 	"reflect"
+ 	"sort"
+ 	"strconv"
++
++	jsoniter "github.com/json-iterator/go"
++	"github.com/tidwall/gjson"
++	"github.com/tidwall/sjson"
++	"go.etcd.io/bbolt"
+ )
+ 
+ func ListSet(bucket string, key string, index int, val interface{}) (err error) {
+@@ -31,20 +32,21 @@ func ListSet(bucket string, key string,
+ }
+ 
+ func ListGet(bucket string, key string, index int) (b []byte, err error) {
+-	err = DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	err = Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			v := bkt.Get([]byte(key))
+ 			if v == nil {
+-				return fmt.Errorf("ListGet: can't get element from an empty list")
++				return dirty, fmt.Errorf("ListGet: can't get element from an empty list")
+ 			}
+ 			r := gjson.GetBytes(v, strconv.Itoa(index))
+ 			if r.Exists() {
+ 				b = []byte(r.Raw)
+-				return nil
++				return dirty, nil
+ 			} else {
+-				return fmt.Errorf("ListGet: no such element")
++				return dirty, fmt.Errorf("ListGet: no such element")
+ 			}
+ 		}
+ 	})
+@@ -79,24 +81,25 @@ func ListAppend(bucket string, key strin
+ }
+ 
+ func ListGetAll(bucket string, key string) (list [][]byte, err error) {
+-	err = DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	err = Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			b := bkt.Get([]byte(key))
+ 			if b == nil {
+-				return nil
++				return dirty, nil
+ 			}
+ 			parsed := gjson.ParseBytes(b)
+ 			if !parsed.IsArray() {
+-				return fmt.Errorf("ListGetAll: is not array")
++				return dirty, fmt.Errorf("ListGetAll: is not array")
+ 			}
+ 			results := parsed.Array()
+ 			for _, r := range results {
+ 				list = append(list, []byte(r.Raw))
+ 			}
+ 		}
+-		return nil
++		return dirty, nil
+ 	})
+ 	return list, err
+ }
+@@ -143,21 +146,22 @@ func ListRemove(bucket, key string, inde
+ }
+ 
+ func ListLen(bucket string, key string) (length int, err error) {
+-	err = DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	err = Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			b := bkt.Get([]byte(key))
+ 			if b == nil {
+-				return nil
++				return dirty, nil
+ 			}
+ 			parsed := gjson.ParseBytes(b)
+ 			if !parsed.IsArray() {
+-				return fmt.Errorf("ListLen: is not array")
++				return dirty, fmt.Errorf("ListLen: is not array")
+ 			}
+ 			length = len(parsed.Array())
+ 		}
+-		return nil
++		return dirty, nil
+ 	})
+ 	return length, err
+ }
+--- a/db/plainOp.go
++++ b/db/plainOp.go
+@@ -2,50 +2,54 @@ package db
+ 
+ import (
+ 	"fmt"
+-	"go.etcd.io/bbolt"
++
+ 	jsoniter "github.com/json-iterator/go"
+ 	"github.com/v2rayA/v2rayA/common"
+ 	"github.com/v2rayA/v2rayA/pkg/util/log"
++	"go.etcd.io/bbolt"
+ )
+ 
+ func Get(bucket string, key string, val interface{}) (err error) {
+-	return DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	return Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			if v := bkt.Get([]byte(key)); v == nil {
+-				return fmt.Errorf("Get: key is not found")
++				return dirty, fmt.Errorf("Get: key is not found")
+ 			} else {
+-				return jsoniter.Unmarshal(v, val)
++				return dirty, jsoniter.Unmarshal(v, val)
+ 			}
+ 		}
+ 	})
+ }
+ 
+ func GetRaw(bucket string, key string) (b []byte, err error) {
+-	err = DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	err = Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			v := bkt.Get([]byte(key))
+ 			if v == nil {
+-				return fmt.Errorf("GetRaw: key is not found")
++				return dirty, fmt.Errorf("GetRaw: key is not found")
+ 			}
+ 			b = common.BytesCopy(v)
+-			return nil
++			return dirty, nil
+ 		}
+ 	})
+ 	return b, err
+ }
+ 
+ func Exists(bucket string, key string) (exists bool) {
+-	if err := DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	if err := Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			v := bkt.Get([]byte(key))
+ 			exists = v != nil
+-			return nil
++			return dirty, nil
+ 		}
+ 	}); err != nil {
+ 		log.Warn("%v", err)
+@@ -55,23 +59,25 @@ func Exists(bucket string, key string) (
+ }
+ 
+ func GetBucketLen(bucket string) (length int, err error) {
+-	err = DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	err = Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			length = bkt.Stats().KeyN
+ 		}
+-		return nil
++		return dirty, nil
+ 	})
+ 	return length, err
+ }
+ 
+ func GetBucketKeys(bucket string) (keys []string, err error) {
+-	err = DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	err = Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+-			return bkt.ForEach(func(k, v []byte) error {
++			return dirty, bkt.ForEach(func(k, v []byte) error {
+ 				keys = append(keys, string(k))
+ 				return nil
+ 			})
+--- a/db/setOp.go
++++ b/db/setOp.go
+@@ -4,8 +4,9 @@ import (
+ 	"bytes"
+ 	"crypto/sha256"
+ 	"encoding/gob"
+-	"go.etcd.io/bbolt"
++
+ 	"github.com/v2rayA/v2rayA/common"
++	"go.etcd.io/bbolt"
+ )
+ 
+ type set map[[32]byte]interface{}
+@@ -28,26 +29,27 @@ func toSha256(val interface{}) (hash [32
+ }
+ 
+ func setOp(bucket string, key string, f func(m set) (readonly bool, err error)) (err error) {
+-	return DB().Update(func(tx *bbolt.Tx) error {
+-		if bkt, err := tx.CreateBucketIfNotExists([]byte(bucket)); err != nil {
+-			return err
++	return Transaction(DB(), func(tx *bbolt.Tx) (bool, error) {
++		dirty := false
++		if bkt, err := CreateBucketIfNotExists(tx, []byte(bucket), &dirty); err != nil {
++			return dirty, err
+ 		} else {
+ 			var m set
+ 			v := bkt.Get([]byte(key))
+ 			if v == nil {
+ 				m = make(set)
+ 			} else if err := gob.NewDecoder(bytes.NewReader(v)).Decode(&m); err != nil {
+-				return err
++				return dirty, err
+ 			}
+ 			if readonly, err := f(m); err != nil {
+-				return err
++				return dirty, err
+ 			} else if readonly {
+-				return nil
++				return dirty, nil
+ 			}
+ 			if b, err := common.ToBytes(m); err != nil {
+-				return err
++				return dirty, err
+ 			} else {
+-				return bkt.Put([]byte(key), b)
++				return true, bkt.Put([]byte(key), b)
+ 			}
+ 		}
+ 	})
diff --git a/net/v2raya/patches/018-fix-do-not-rollback-closed-transaction.patch b/net/v2raya/patches/018-fix-do-not-rollback-closed-transaction.patch
new file mode 100644
index 000000000..b9815f459
--- /dev/null
+++ b/net/v2raya/patches/018-fix-do-not-rollback-closed-transaction.patch
@@ -0,0 +1,27 @@
+From 451912074ba1ba4000c66874876bc0a6b64cb5da Mon Sep 17 00:00:00 2001
+From: Kelo <meetkelo@outlook.com>
+Date: Sun, 30 Oct 2022 16:49:22 +0800
+Subject: [PATCH] fix: do not rollback closed transaction
+
+---
+ service/db/boltdb.go | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/db/boltdb.go
++++ b/db/boltdb.go
+@@ -56,14 +56,13 @@ func Transaction(db *bbolt.DB, fn func(*
+ 	if err != nil {
+ 		return err
+ 	}
+-	defer tx.Rollback()
+ 	dirty, err := fn(tx)
+ 	if err != nil {
+ 		_ = tx.Rollback()
+ 		return err
+ 	}
+ 	if !dirty {
+-		return nil
++		return tx.Rollback()
+ 	}
+ 	return tx.Commit()
+ }

From e6d746a0baa184db3caf7a088179356c798a96d3 Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.ca>
Date: Mon, 28 Nov 2022 21:12:07 +0000
Subject: [PATCH 22/25] https-dns-proxy: improve performance on restart

* instead of doing stop/start which involves restarting dnsmasq twice,
  kill the existing service instances on restart instead

Signed-off-by: Stan Grishin <stangri@melmac.ca>
---
 net/https-dns-proxy/Makefile                   | 2 +-
 net/https-dns-proxy/files/https-dns-proxy.init | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile
index ed2e4677e..81b01e5b9 100644
--- a/net/https-dns-proxy/Makefile
+++ b/net/https-dns-proxy/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=https-dns-proxy
 PKG_VERSION:=2022-10-15
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/
diff --git a/net/https-dns-proxy/files/https-dns-proxy.init b/net/https-dns-proxy/files/https-dns-proxy.init
index 4f0906560..cae80f161 100755
--- a/net/https-dns-proxy/files/https-dns-proxy.init
+++ b/net/https-dns-proxy/files/https-dns-proxy.init
@@ -279,6 +279,7 @@ service_triggers() {
 
 service_started() { procd_set_config_changed firewall; }
 service_stopped() { procd_set_config_changed firewall; }
+restart() { procd_send_signal "$packageName"; }
 
 dnsmasq_doh_server() {
 	local cfg="$1" param="$2" address="${3:-127.0.0.1}" port="$4" i

From cc10774e6e3799ac86af83d8c35c6a37fd73c15a Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.ca>
Date: Mon, 28 Nov 2022 04:37:42 +0000
Subject: [PATCH 23/25] simple-adblock: bugfix: detect dnsmasq ipset support

* Fixes https://github.com/openwrt/packages/issues/19978, thank you
  @parona-source for the report/patch!

Signed-off-by: Stan Grishin <stangri@melmac.ca>
---
 net/simple-adblock/Makefile                  | 2 +-
 net/simple-adblock/files/simple-adblock.init | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile
index a2f05f792..6778f3a7b 100644
--- a/net/simple-adblock/Makefile
+++ b/net/simple-adblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=simple-adblock
 PKG_VERSION:=1.9.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
 PKG_LICENSE:=GPL-3.0-or-later
 
diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init
index 58c8eb7a7..7c9829d15 100644
--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@@ -393,7 +393,7 @@ load_environment() {
 	output "$_ERROR_: $serviceName failed to discover WAN gateway.\\n"; return 1;
 }
 
-dnsmasq() {
+resolver() {
 	local cfg="$1" param="$2"
 	case "$param" in
 		dnsmasq.addnhosts)
@@ -430,10 +430,10 @@ dns() {
 
 			config_load 'dhcp'
 			if [ "$dns_instance" = "*" ]; then
-				config_foreach dnsmasq 'dnsmasq' "$dns"
+				config_foreach resolver 'dnsmasq' "$dns"
 			elif [ -n "$dns_instance" ]; then
 				for i in $dns_instance; do
-					dnsmasq "@dnsmasq[$i]" "$dns" || dnsmasq "$i" "$dns"
+					resolver "@dnsmasq[$i]" "$dns" || resolver "$i" "$dns"
 				done
 			fi
 
@@ -1426,7 +1426,7 @@ killcache() {
 	rm -f "$dnsmasqServersCache" "$dnsmasqServersGzip"
 	rm -f "$unboundCache" "$unboundGzip"
 	config_load 'dhcp'
-	config_foreach dnsmasq 'dnsmasq' 'cleanup'
+	config_foreach resolver 'dnsmasq' 'cleanup'
 	uci_commit 'dhcp'
 	return 0
 }

From 8bd96675b27584b7686f053af0a6bd63c2484c92 Mon Sep 17 00:00:00 2001
From: John Audia <therealgraysky@proton.me>
Date: Mon, 28 Nov 2022 08:20:10 -0500
Subject: [PATCH 24/25] snort3: update to 3.1.47.0-1

Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

Signed-off-by: John Audia <therealgraysky@proton.me>
---
 net/snort3/Makefile                         |  9 ++++++---
 net/snort3/patches/010-update-openssl.patch | 21 ---------------------
 2 files changed, 6 insertions(+), 24 deletions(-)
 delete mode 100644 net/snort3/patches/010-update-openssl.patch

diff --git a/net/snort3/Makefile b/net/snort3/Makefile
index c2abfb4f7..fd2f76bd8 100644
--- a/net/snort3/Makefile
+++ b/net/snort3/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort3
-PKG_VERSION:=3.1.29.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=3.1.47.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
-PKG_HASH:=becec36b57af3d65ae8289b73cd6d56bf8bde774539c74b35b0ec2262a587281
+PKG_HASH:=7565411db11b453a98f8bd88eeef0fa9f2e85416a8f595e710aa19c430228b8c
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=GPL-2.0-only
@@ -94,6 +94,9 @@ define Package/snort3/install
 	$(INSTALL_CONF) \
 		$(PKG_INSTALL_DIR)/usr/etc/snort/*.lua \
 		$(1)/etc/snort
+	$(INSTALL_CONF) \
+		$(PKG_INSTALL_DIR)/usr/etc/snort/file_magic.rules \
+		$(1)/etc/snort
 
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) \
diff --git a/net/snort3/patches/010-update-openssl.patch b/net/snort3/patches/010-update-openssl.patch
deleted file mode 100644
index 63e7c0288..000000000
--- a/net/snort3/patches/010-update-openssl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/network_inspectors/appid/appid_inspector.cc
-+++ b/src/network_inspectors/appid/appid_inspector.cc
-@@ -68,7 +68,6 @@ static THREAD_LOCAL PacketTracer::Tracer
- //           should probably be done outside of appid
- static void openssl_cleanup()
- {
--    CRYPTO_cleanup_all_ex_data();
- }
- 
- static void add_appid_to_packet_trace(Flow& flow, const OdpContext& odp_context)
---- a/src/utils/util.cc
-+++ b/src/utils/util.cc
-@@ -111,7 +111,7 @@ int DisplayBanner()
-     LogMessage("           Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n");
-     LogMessage("           Using DAQ version %s\n", daq_version_string());
-     LogMessage("           Using LuaJIT version %s\n", ljv);
--    LogMessage("           Using %s\n", SSLeay_version(SSLEAY_VERSION));
-+    LogMessage("           Using %s\n", OpenSSL_version(SSLEAY_VERSION));
-     LogMessage("           Using %s\n", pcap_lib_version());
-     LogMessage("           Using PCRE version %s\n", pcre_version());
-     LogMessage("           Using ZLIB version %s\n", zlib_version);

From a694130993d9d9eed8689ecdc1d6044dca3dc40e Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Tue, 29 Nov 2022 20:03:26 +0200
Subject: [PATCH 25/25] wget: update to 1.21.3

Update wget to 1.21.3

* Remove patch 100-fix-hsts-time.patch as upstream has issued
  its own version on the fixes

* Add a hack (and fixup autoreconf) to fix an upstream bug that
  forces the nettle library into nossl even if NTLM is disabled.
  Upstream bug filed: https://savannah.gnu.org/bugs/?63431

* Remove old maintainer who has not been active

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---
 net/wget/Makefile                          |  9 ++--
 net/wget/patches/001-fix-nettle-ntml.patch | 18 ++++++++
 net/wget/patches/100-fix-hsts-time.patch   | 54 ----------------------
 3 files changed, 23 insertions(+), 58 deletions(-)
 create mode 100644 net/wget/patches/001-fix-nettle-ntml.patch
 delete mode 100644 net/wget/patches/100-fix-hsts-time.patch

diff --git a/net/wget/Makefile b/net/wget/Makefile
index f6b088121..7589ef1a8 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -8,18 +8,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wget
-PKG_VERSION:=1.21.2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=1.21.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=e6d4c76be82c676dd7e8c61a29b2ac8510ae108a810b5d1d18fc9a1d2c9a2497
+PKG_HASH:=5726bb8bc5ca0f6dc7110f6416e4bb7019e2d2ff5bf93d1ca2ffcc6656f220e5
 
-PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
+PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
 PKG_CPE_ID:=cpe:/a:gnu:wget
 
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
diff --git a/net/wget/patches/001-fix-nettle-ntml.patch b/net/wget/patches/001-fix-nettle-ntml.patch
new file mode 100644
index 000000000..1cddf4070
--- /dev/null
+++ b/net/wget/patches/001-fix-nettle-ntml.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -630,6 +630,7 @@ then
+     AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.])
+   fi
+ else
++ if test x"$ENABLE_NTLM" != xno; then
+   PKG_CHECK_MODULES([NETTLE], nettle, [
+     HAVE_NETTLE=yes
+     LIBS="$NETTLE_LIBS $LIBS"
+@@ -651,6 +652,7 @@ else
+     ENABLE_NTLM=yes
+     AC_DEFINE([ENABLE_NTLM], 1, [Define if you want the NTLM authorization support compiled in.])
+   fi
++ fi
+ fi
+ 
+ dnl **********************************************************************
diff --git a/net/wget/patches/100-fix-hsts-time.patch b/net/wget/patches/100-fix-hsts-time.patch
deleted file mode 100644
index 964d2957b..000000000
--- a/net/wget/patches/100-fix-hsts-time.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Huangbin Zhan <zhanhb88@gmail.com>
-Date: Tue, 9 Nov 2021 23:05:55 +0800
-Subject: [PATCH] hsts.c: fix timestamp reading and writing.
-
-Always get zero time on big endian 32bit OS with 64bit time_t such as mips_24kc_musl.
----
- src/hsts.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
---- a/src/hsts.c
-+++ b/src/hsts.c
-@@ -280,7 +280,7 @@ hsts_read_database (hsts_store_t store,
- 
-   char host[256];
-   int port;
--  time_t created, max_age;
-+  uintmax_t created, max_age;
-   int include_subdomains;
- 
-   func = (merge_with_existing_entries ? hsts_store_merge : hsts_new_entry);
-@@ -293,15 +293,15 @@ hsts_read_database (hsts_store_t store,
-       if (*p == '#')
-         continue;
- 
--      items_read = sscanf (p, "%255s %d %d %lu %lu",
-+      items_read = sscanf (p, "%255s %d %d %"SCNuMAX" %"SCNuMAX,
-                            host,
-                            &port,
-                            &include_subdomains,
--                           (unsigned long *) &created,
--                           (unsigned long *) &max_age);
-+                           &created,
-+                           &max_age);
- 
-       if (items_read == 5)
--        func (store, host, port, created, max_age, !!include_subdomains);
-+        func (store, host, port, (time_t) created, (time_t) max_age, !!include_subdomains);
-     }
- 
-   xfree (line);
-@@ -326,10 +326,10 @@ hsts_store_dump (hsts_store_t store, FIL
-       struct hsts_kh *kh = (struct hsts_kh *) it.key;
-       struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value;
- 
--      if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n",
-+      if (fprintf (fp, "%s\t%d\t%d\t%"PRIuMAX"\t%"PRIuMAX"\n",
-                    kh->host, kh->explicit_port, khi->include_subdomains,
--                   (unsigned long) khi->created,
--                   (unsigned long) khi->max_age) < 0)
-+                   (uintmax_t) khi->created,
-+                   (uintmax_t) khi->max_age) < 0)
-         {
-           logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n");
-           break;