diff --git a/lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch b/lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch new file mode 100644 index 000000000..189957178 --- /dev/null +++ b/lang/golang/golang/patches/010-cmd-compile-turn-off-jump-tables-when-spectre-retpolines-.patch @@ -0,0 +1,67 @@ +From 156578067111742b55718066c91b8ec66d35e03d Mon Sep 17 00:00:00 2001 +From: Keith Randall +Date: Mon, 5 Dec 2022 16:26:26 -0800 +Subject: [PATCH] [release-branch.go1.19] cmd/compile: turn off jump tables + when spectre retpolines are on + +Fixes #57100 + +Change-Id: I6ab659abbca1ae0ac8710674d39aec116fab0baa +Reviewed-on: https://go-review.googlesource.com/c/go/+/455336 +Reviewed-by: Keith Randall +Reviewed-by: Cherry Mui +TryBot-Result: Gopher Robot +Run-TryBot: Keith Randall +(cherry picked from commit 1eb0465fa596a2d6e9c1a632499989544f0d7e68) +Reviewed-on: https://go-review.googlesource.com/c/go/+/455416 +Reviewed-by: Michael Pratt +--- + src/cmd/compile/internal/walk/switch.go | 2 +- + test/codegen/retpoline.go | 28 +++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 1 deletion(-) + +--- a/src/cmd/compile/internal/walk/switch.go ++++ b/src/cmd/compile/internal/walk/switch.go +@@ -289,7 +289,7 @@ func (s *exprSwitch) tryJumpTable(cc []e + const minCases = 8 // have at least minCases cases in the switch + const minDensity = 4 // use at least 1 out of every minDensity entries + +- if !go119UseJumpTables || base.Flag.N != 0 || !ssagen.Arch.LinkArch.CanJumpTable { ++ if !go119UseJumpTables || base.Flag.N != 0 || !ssagen.Arch.LinkArch.CanJumpTable || base.Ctxt.Retpoline { + return false + } + if len(cc) < minCases { +--- a/test/codegen/retpoline.go ++++ b/test/codegen/retpoline.go +@@ -12,3 +12,31 @@ func CallInterface(x interface{ M() }) { + // amd64:`CALL\truntime.retpoline` + x.M() + } ++ ++// Check to make sure that jump tables are disabled ++// when retpoline is on. See issue 57097. ++func noJumpTables(x int) int { ++ switch x { ++ case 0: ++ return 0 ++ case 1: ++ return 1 ++ case 2: ++ return 2 ++ case 3: ++ return 3 ++ case 4: ++ return 4 ++ case 5: ++ return 5 ++ case 6: ++ return 6 ++ case 7: ++ return 7 ++ case 8: ++ return 8 ++ case 9: ++ return 9 ++ } ++ return 10 ++} diff --git a/lang/luaexpat/Makefile b/lang/luaexpat/Makefile index 741366ebe..1a7b077df 100644 --- a/lang/luaexpat/Makefile +++ b/lang/luaexpat/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luaexpat -PKG_VERSION:=1.4.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.5.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lunarmodules/luaexpat/archive/refs/tags -PKG_HASH:=d528060d45865b44bef7215ef8a440165b668f363a4af53358389f0315a8593c +PKG_HASH:=7d455f154de59eb0b073c3620bc8b873f7f697b3f21a112e6ff8dc9fca6d0826 PKG_CPE_ID:=cpe:/a:matthewwild:luaexpat diff --git a/lang/luasec/Makefile b/lang/luasec/Makefile index 8cef2c71c..5c1de2e85 100644 --- a/lang/luasec/Makefile +++ b/lang/luasec/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasec -PKG_VERSION:=0.9 +PKG_VERSION:=1.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/brunoos/luasec/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=6b6b94e8517bf6baf545fad29a2112f9ac7957ad85b4aae8e0727bec77d7a325 +PKG_HASH:=2e86ef8f3486dc1bbecd752d16741a59a01633279facdfe5631f33b6eed1a30a MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT diff --git a/lang/luasocket/Makefile b/lang/luasocket/Makefile index c0b07e3cb..7125f78c1 100644 --- a/lang/luasocket/Makefile +++ b/lang/luasocket/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luasocket -PKG_VERSION:=3.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/lunarmodules/luasocket/archive/refs/tags -PKG_HASH:=04d98e40edcee7c7c5f83f0e8ba5503d14b56280e20daceee9e34ed7cf8f1b15 +PKG_HASH:=bf033aeb9e62bcaa8d007df68c119c966418e8c9ef7e4f2d7e96bddeca9cca6e PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=MIT @@ -76,13 +76,13 @@ define Package/luasocket/install $(INSTALL_DIR) $(1)/usr/lib/lua $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ltn12,mime,socket}.lua $(1)/usr/lib/lua $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mime-1.0.3.so $(1)/usr/lib/lua - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket-3.0-rc1.so $(1)/usr/lib/lua + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/socket-3.0.0.so $(1)/usr/lib/lua $(INSTALL_DIR) $(1)/usr/lib/lua/mime ln -sf ../mime-1.0.3.so $(1)/usr/lib/lua/mime/core.so $(INSTALL_DIR) $(1)/usr/lib/lua/socket $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/{ftp,http,smtp,tp,url,headers}.lua $(1)/usr/lib/lua/socket $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/unix.so $(1)/usr/lib/lua/socket - ln -sf ../socket-3.0-rc1.so $(1)/usr/lib/lua/socket/core.so + ln -sf ../socket-3.0.0.so $(1)/usr/lib/lua/socket/core.so endef diff --git a/lang/luasocket/patches/0001-Add-interface-support.patch b/lang/luasocket/patches/0001-Add-interface-support.patch index 43c74e9f5..d7bfe2bb8 100644 --- a/lang/luasocket/patches/0001-Add-interface-support.patch +++ b/lang/luasocket/patches/0001-Add-interface-support.patch @@ -213,7 +213,7 @@ Subject: [PATCH] Add interface resolving /*=========================================================================*\ * Internal functions prototypes \*=========================================================================*/ -@@ -389,6 +392,12 @@ static int opt_ip6_setmembership(lua_Sta +@@ -414,6 +417,12 @@ static int opt_ip6_setmembership(lua_Sta if (!lua_isnil(L, -1)) { if (lua_isnumber(L, -1)) { val.ipv6mr_interface = (unsigned int) lua_tonumber(L, -1); diff --git a/lang/node/Makefile b/lang/node/Makefile index 3adc95db5..52c513ddc 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=node -PKG_VERSION:=v16.17.1 +PKG_VERSION:=v16.19.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION) -PKG_HASH:=6721feb4152d56d2c6b358ce397abd5a7f1daf09ee2e25c5021b9b4d3f86a330 +PKG_HASH:=4f1fec1aea2392f6eb6d1d040b01e7ee3e51e762a9791dfea590920bc1156706 PKG_MAINTAINER:=Hirokazu MORIKAWA , Adrian Panella PKG_LICENSE:=MIT diff --git a/lang/node/patches/003-path.patch b/lang/node/patches/003-path.patch index 9599cbfec..42e07f2cd 100644 --- a/lang/node/patches/003-path.patch +++ b/lang/node/patches/003-path.patch @@ -1,6 +1,6 @@ --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js -@@ -1261,7 +1261,8 @@ Module._initPaths = function() { +@@ -1300,7 +1300,8 @@ Module._initPaths = function() { path.resolve(process.execPath, '..') : path.resolve(process.execPath, '..', '..'); diff --git a/lang/python/MarkupSafe/Makefile b/lang/python/MarkupSafe/Makefile index 9a01871f4..177f072e7 100644 --- a/lang/python/MarkupSafe/Makefile +++ b/lang/python/MarkupSafe/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=MarkupSafe -PKG_VERSION:=2.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.1 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f +PKG_HASH:=7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause diff --git a/lang/python/Werkzeug/Makefile b/lang/python/Werkzeug/Makefile index dc14af70e..3c2b5df17 100644 --- a/lang/python/Werkzeug/Makefile +++ b/lang/python/Werkzeug/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Werkzeug -PKG_VERSION:=2.0.2 +PKG_VERSION:=2.2.2 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a +PKG_HASH:=7ea2d48322cc7c0f8b3a215ed73eabd7b5d75d0b50e31ab006286ccff9e00b8f PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause diff --git a/lang/python/click/Makefile b/lang/python/click/Makefile index 74223fe5b..7babd28b3 100644 --- a/lang/python/click/Makefile +++ b/lang/python/click/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=click -PKG_VERSION:=8.0.3 +PKG_VERSION:=8.1.3 PKG_RELEASE:=1 PYPI_NAME:=click -PKG_HASH:=410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b +PKG_HASH:=7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause diff --git a/lang/python/itsdangerous/Makefile b/lang/python/itsdangerous/Makefile index 423d80adc..6a364eb80 100644 --- a/lang/python/itsdangerous/Makefile +++ b/lang/python/itsdangerous/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=itsdangerous -PKG_VERSION:=2.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.2 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0 +PKG_HASH:=5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=BSD-3-Clause diff --git a/lang/python/python-curl/Makefile b/lang/python/python-curl/Makefile index 630ccd941..4f46dc5fc 100644 --- a/lang/python/python-curl/Makefile +++ b/lang/python/python-curl/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pycurl -PKG_VERSION:=7.44.0 -PKG_RELEASE:=2 +PKG_VERSION:=7.45.2 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=2ce9905626d8ceafcbadee666e2f45397e29c7618ddcdc63fc22d85e5046c6d6 +PKG_HASH:=5730590be0271364a5bddd9e245c9cc0fb710c4cbacbdd95264a3122d23224ca PKG_MAINTAINER:=Waldemar Konik PKG_LICENSE:=LGPL-2.1 diff --git a/lang/python/python-curl/patches/100_macos_compat.patch b/lang/python/python-curl/patches/100_macos_compat.patch index fc233da2a..ba5e0b8da 100644 --- a/lang/python/python-curl/patches/100_macos_compat.patch +++ b/lang/python/python-curl/patches/100_macos_compat.patch @@ -3,7 +3,7 @@ This patch should be deleted after resolving https://github.com/pycurl/pycurl/is --- --- a/setup.py +++ b/setup.py -@@ -347,9 +347,6 @@ manually. For other SSL backends please +@@ -341,9 +341,6 @@ ignore this message.''') if not self.libraries: self.libraries.append("curl") diff --git a/lang/python/python3-networkx/Makefile b/lang/python/python3-networkx/Makefile index 7b7f44b8f..e4d75305b 100644 --- a/lang/python/python3-networkx/Makefile +++ b/lang/python/python3-networkx/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python3-networkx -PKG_VERSION:=2.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.8.8 +PKG_RELEASE:=1 PYPI_NAME:=networkx -PKG_HASH:=4a52cf66aed221955420e11b3e2e05ca44196b4829aab9576d4d439212b0a14f +PKG_HASH:=230d388117af870fce5647a3c52401fcf753e94720e6ea6b4197a5355648885e PKG_LICENSE:=BSD-3-clause PKG_LICENSE_FILES:=LICENSE.txt diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 37604fd89..816b1f1da 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz diff --git a/lang/python/python3/patches/026-openssl-feature-flags.patch b/lang/python/python3/patches/026-openssl-feature-flags.patch deleted file mode 100644 index b4c15ab80..000000000 --- a/lang/python/python3/patches/026-openssl-feature-flags.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/Modules/_hashopenssl.c -+++ b/Modules/_hashopenssl.c -@@ -45,10 +45,12 @@ - - #define MUNCH_SIZE INT_MAX - -+#if !defined(LIBRESSL_VERSION_NUMBER) - #define PY_OPENSSL_HAS_SCRYPT 1 - #define PY_OPENSSL_HAS_SHA3 1 - #define PY_OPENSSL_HAS_SHAKE 1 - #define PY_OPENSSL_HAS_BLAKE2 1 -+#endif - - #if OPENSSL_VERSION_NUMBER >= 0x30000000L - #define PY_EVP_MD EVP_MD -@@ -119,6 +121,7 @@ static const py_hashentry_t py_hashes[] - PY_HASH_ENTRY(Py_hash_sha256, "SHA256", SN_sha256, NID_sha256), - PY_HASH_ENTRY(Py_hash_sha384, "SHA384", SN_sha384, NID_sha384), - PY_HASH_ENTRY(Py_hash_sha512, "SHA512", SN_sha512, NID_sha512), -+#if !defined(LIBRESSL_VERSION_NUMBER) - /* truncated sha2 */ - PY_HASH_ENTRY(Py_hash_sha512_224, "SHA512_224", SN_sha512_224, NID_sha512_224), - PY_HASH_ENTRY(Py_hash_sha512_256, "SHA512_256", SN_sha512_256, NID_sha512_256), -@@ -133,6 +136,7 @@ static const py_hashentry_t py_hashes[] - /* blake2 digest */ - PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256, NID_blake2s256), - PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512, NID_blake2b512), -+#endif - PY_HASH_ENTRY(NULL, NULL, NULL, 0), - }; - -@@ -873,11 +877,15 @@ py_evp_fromname(PyObject *module, const - goto exit; - } - -+#if defined(LIBRESSL_VERSION_NUMBER) -+ type = get_hashlib_state(module)->EVPtype; -+#else - if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) { - type = get_hashlib_state(module)->EVPXOFtype; - } else { - type = get_hashlib_state(module)->EVPtype; - } -+#endif - - self = newEVPobject(type); - if (self == NULL) { diff --git a/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch b/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch deleted file mode 100644 index 7b47c111f..000000000 --- a/lang/python/python3/patches/028-host-python-support-ssl-with-libressl.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -67,6 +67,12 @@ - # error "OPENSSL_THREADS is not defined, Python requires thread-safe OpenSSL" - #endif - -+#ifdef LIBRESSL_VERSION_NUMBER -+static int SSL_CTX_get_security_level(const SSL_CTX *ctx) -+{ -+ return 1; -+} -+#endif - - - struct py_ssl_error_code { -@@ -169,7 +175,11 @@ extern const SSL_METHOD *TLSv1_2_method( - * Based on Hynek's excellent blog post (update 2021-02-11) - * https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/ - */ -+#ifndef LIBRESSL_VERSION_NUMBER - #define PY_SSL_DEFAULT_CIPHER_STRING "@SECLEVEL=2:ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM" -+#else -+ #define PY_SSL_DEFAULT_CIPHER_STRING "ECDH+AESGCM:ECDH+CHACHA20:ECDH+AES:DHE+AES:!aNULL:!eNULL:!aDSS:!SHA1:!AESCCM" -+#endif - #ifndef PY_SSL_MIN_PROTOCOL - #define PY_SSL_MIN_PROTOCOL TLS1_2_VERSION - #endif diff --git a/libs/boost/Makefile b/libs/boost/Makefile index 4fe77be5c..9180e9ecb 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -384,7 +384,13 @@ TARGET_LDFLAGS += -pthread -lrt -lstdc++ -Wl,--gc-sections,--as-needed,--print-g TARGET_CFLAGS += \ $(if $(CONFIG_SOFT_FLOAT),-DBOOST_NO_FENV_H) -fPIC -ffunction-sections -fdata-sections -flto -EXTRA_CXXFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-std=gnu++20,$(if $(CONFIG_GCC_USE_VERSION_5),-std=gnu++14,-std=gnu++17)) +ifeq ($(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION)))),5) + EXTRA_CXXFLAGS += -std=gnu++14 +else ifneq ($(filter-out 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),) + EXTRA_CXXFLAGS += -std=gnu++17 +else + EXTRA_CXXFLAGS += -std=gnu++20 +endif ifneq ($(findstring mips,$(ARCH)),) BOOST_ABI = o32 diff --git a/libs/hwloc/Makefile b/libs/hwloc/Makefile index 3b8637815..cc3dc9f20 100644 --- a/libs/hwloc/Makefile +++ b/libs/hwloc/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hwloc -PKG_VERSION:=2.7.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.8.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.7 -PKG_HASH:=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d +PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.8 +PKG_HASH:=348a72fcd48c32a823ee1da149ae992203e7ad033549e64aed6ea6eeb01f42c1 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=BSD-3-Clause diff --git a/libs/libarchive/Makefile b/libs/libarchive/Makefile index ead7b904b..95b96a39b 100644 --- a/libs/libarchive/Makefile +++ b/libs/libarchive/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libarchive -PKG_VERSION:=3.6.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.6.2 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.libarchive.org/downloads -PKG_HASH:=5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 +PKG_HASH:=9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d PKG_MAINTAINER:=Johannes Morgenroth PKG_LICENSE:=BSD-2-Clause @@ -34,6 +34,7 @@ endef define Package/libarchive $(call Package/libarchive/Default) DEPENDS += +libopenssl + CONFLICTS:=libarchive-noopenssl endef define Package/libarchive-noopenssl diff --git a/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch b/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch deleted file mode 100644 index 812e451c2..000000000 --- a/libs/libarchive/patches/001-libarchive-Do-not-include-sys-mount.h-when-linux-fs.h-is-present.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 25 Jul 2022 10:56:53 -0700 -Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is - present - -These headers are in conflict and only one is needed by -archive_read_disk_posix.c therefore include linux/fs.h if it exists -otherwise include sys/mount.h - -It also helps compiling with glibc 2.36 -where sys/mount.h conflicts with linux/mount.h see [1] - -[1] https://sourceware.org/glibc/wiki/Release/2.36 ---- - libarchive/archive_read_disk_posix.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/libarchive/archive_read_disk_posix.c -+++ b/libarchive/archive_read_disk_posix.c -@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$"); - #ifdef HAVE_SYS_PARAM_H - #include - #endif --#ifdef HAVE_SYS_MOUNT_H --#include --#endif - #ifdef HAVE_SYS_STAT_H - #include - #endif -@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$"); - #endif - #ifdef HAVE_LINUX_FS_H - #include -+#elif HAVE_SYS_MOUNT_H -+#include - #endif - /* - * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. diff --git a/libs/libgpiod/Makefile b/libs/libgpiod/Makefile index a5ece1031..9859dca27 100644 --- a/libs/libgpiod/Makefile +++ b/libs/libgpiod/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpiod PKG_VERSION:=1.6.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/libs/libgpiod/ @@ -43,6 +43,9 @@ define Package/libgpiod CATEGORY:=Libraries URL:=https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git TITLE:=Library for interacting with Linux's GPIO character device + KCONFIG:= \ + CONFIG_GPIO_CDEV=y \ + CONFIG_GPIO_CDEV_V1=y DEPENDS:=@GPIO_SUPPORT endef diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile index a6c77dc95..6c87fdb11 100644 --- a/libs/libsoup/Makefile +++ b/libs/libsoup/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup -PKG_VERSION:=2.74.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.74.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.74 -PKG_HASH:=f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159 +PKG_HASH:=e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile index b911fb788..b322cc876 100644 --- a/libs/libsoup3/Makefile +++ b/libs/libsoup3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsoup3 -PKG_VERSION:=3.2.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.2.2 +PKG_RELEASE:=1 PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNOME/libsoup/3.2 -PKG_HASH:=b1eb3d2c3be49fbbd051a71f6532c9626bcecea69783190690cd7e4dfdf28f29 +PKG_HASH:=83673c685b910fb7d39f1f28eee5afbefb71c05798fc350ac3bf1b885e1efaa1 PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 89f35dfc5..3c5642266 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap -PKG_VERSION:=2.6.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.6.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/ \ https://mirror.eu.oneandone.net/software/openldap/openldap-release/ \ https://www.openldap.org/software/download/OpenLDAP/openldap-release/ -PKG_HASH:=81d09345232eb62486ecf5acacd2c56c0c45b4a6c8c066612e7f421a23a1cf87 +PKG_HASH:=d2a2a1d71df3d77396b1c16ad7502e674df446e06072b0e5a4e941c3d06c0d46 PKG_LICENSE:=OLDAP-2.8 PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:openldap:openldap diff --git a/libs/openldap/patches/001-automake-compat.patch b/libs/openldap/patches/001-automake-compat.patch index c1d4e86da..d1e4b2aa9 100644 --- a/libs/openldap/patches/001-automake-compat.patch +++ b/libs/openldap/patches/001-automake-compat.patch @@ -62,7 +62,7 @@ +SHELL = @SHELL@ + SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \ - session.c subst.c var.c xmap.c \ + session.c subst.c var.c xmap.c escapemap.c \ parse.c rewrite.c --- a/libraries/Makefile.in +++ b/libraries/Makefile.in diff --git a/libs/vips/Makefile b/libs/vips/Makefile index c6477edb3..f07698dc3 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=8.12.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=8.13.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION) -PKG_HASH:=565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b +PKG_HASH:=4eff5cdc8dbe1a05a926290a99014e20ba386f5dcca38d9774bef61413435d4c PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later diff --git a/mail/pigeonhole/Makefile b/mail/pigeonhole/Makefile index 04e1b1eb5..7192463ed 100644 --- a/mail/pigeonhole/Makefile +++ b/mail/pigeonhole/Makefile @@ -8,16 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dovecot-pigeonhole -PKG_VERSION_PLUGIN:=0.5.18 +PKG_VERSION_PLUGIN:=0.5.19 PKG_VERSION_DOVECOT:=$(shell make --no-print-directory -C ../dovecot/ val.PKG_VERSION V=s) PKG_VERSION:=$(PKG_VERSION_DOVECOT)-$(PKG_VERSION_PLUGIN) -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 DOVECOT_VERSION:=2.3 PKG_SOURCE:=dovecot-$(DOVECOT_VERSION)-pigeonhole-$(PKG_VERSION_PLUGIN).tar.gz PKG_SOURCE_URL:=https://pigeonhole.dovecot.org/releases/$(DOVECOT_VERSION) -PKG_HASH:=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5 +PKG_HASH:=637709a83fb1338c918e5398049f96b7aeb5ae00696794ed1e5a4d4c0ca3f688 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=LGPL-2.1-or-later diff --git a/multimedia/graphicsmagick/Makefile b/multimedia/graphicsmagick/Makefile index ff104fdeb..70a340864 100644 --- a/multimedia/graphicsmagick/Makefile +++ b/multimedia/graphicsmagick/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS += \ --without-zstd \ --without-x -TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),,-flto) +TARGET_CFLAGS += $(if $(filter-out 5 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),,-flto) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/multimedia/gst1-libav/Makefile b/multimedia/gst1-libav/Makefile index 766478916..5ea8a813e 100644 --- a/multimedia/gst1-libav/Makefile +++ b/multimedia/gst1-libav/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-libav -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav -PKG_HASH:=b5c531dd8413bf771c79dab66b8e389f20b3991f745115133f0fa0b8e32809f9 +PKG_HASH:=04ccbdd58fb31dd94098da599209834a0e7661638c5703381dd0a862c56fc532 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-bad/Makefile b/multimedia/gst1-plugins-bad/Makefile index cc6e29f89..7dace2b53 100644 --- a/multimedia/gst1-plugins-bad/Makefile +++ b/multimedia/gst1-plugins-bad/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-bad -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/ -PKG_HASH:=4adc4c05f41051f8136b80cda99b0d049a34e777832f9fea7c5a70347658745b +PKG_HASH:=a1a3f53b3604d9a04fdd0bf9a1a616c3d2dab5320489e9ecee1178e81e33a16a PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-bad/patches/010-distutils.patch b/multimedia/gst1-plugins-bad/patches/010-distutils.patch index 691362d59..fbea8ae10 100644 --- a/multimedia/gst1-plugins-bad/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-bad/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -468,7 +468,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H +@@ -467,7 +467,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H configinc = include_directories('.') libsinc = include_directories('gst-libs') diff --git a/multimedia/gst1-plugins-base/Makefile b/multimedia/gst1-plugins-base/Makefile index 007b760e1..ce06a0710 100644 --- a/multimedia/gst1-plugins-base/Makefile +++ b/multimedia/gst1-plugins-base/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-base -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base -PKG_HASH:=ab0656f2ad4d38292a803e0cb4ca090943a9b43c8063f650b4d3e3606c317f17 +PKG_HASH:=8d181b7abe4caf23ee9f9ec5b4d3e232640452464e39495bfffb6d776fc97225 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-base/patches/010-distutils.patch b/multimedia/gst1-plugins-base/patches/010-distutils.patch index 10322a719..388860e0a 100644 --- a/multimedia/gst1-plugins-base/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-base/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -457,7 +457,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] +@@ -456,7 +456,7 @@ pkgconfig_subdirs = ['gstreamer-1.0'] meson_pkg_config_file_fixup_script = find_program('scripts/meson-pkg-config-file-fixup.py') diff --git a/multimedia/gst1-plugins-good/Makefile b/multimedia/gst1-plugins-good/Makefile index 32d55dc6c..311d8ba3d 100644 --- a/multimedia/gst1-plugins-good/Makefile +++ b/multimedia/gst1-plugins-good/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-good -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/ -PKG_HASH:=83589007bf002b8f9ef627718f308c16d83351905f0db8e85c3060f304143aae +PKG_HASH:=b16130fbe632fa8547c2147a0ef575b0140fb521065c5cb121c72ddbd23b64da PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-good/patches/010-distutils.patch b/multimedia/gst1-plugins-good/patches/010-distutils.patch index 0e30a9eee..7092bfcda 100644 --- a/multimedia/gst1-plugins-good/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-good/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -441,7 +441,7 @@ endif +@@ -434,7 +434,7 @@ endif presetdir = join_paths(get_option('datadir'), 'gstreamer-' + api_version, 'presets') diff --git a/multimedia/gst1-plugins-ugly/Makefile b/multimedia/gst1-plugins-ugly/Makefile index aacc4aa08..44358fa17 100644 --- a/multimedia/gst1-plugins-ugly/Makefile +++ b/multimedia/gst1-plugins-ugly/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst1-plugins-ugly -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly -PKG_HASH:=b43fb4df94459afbf67ec22003ca58ffadcd19e763f276dca25b64c848adb7bf +PKG_HASH:=5c9ec6bab96517e438b3f9bae0ceb84d3436f3da9bbe180cf4d28e32a7251b59 PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch index b0bf4ebce..9f1b2efab 100644 --- a/multimedia/gst1-plugins-ugly/patches/010-distutils.patch +++ b/multimedia/gst1-plugins-ugly/patches/010-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -279,7 +279,7 @@ endif +@@ -278,7 +278,7 @@ endif gpl_allowed = get_option('gpl').allowed() diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 26da641a5..6fe3a6399 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer1 -PKG_VERSION:=1.20.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.4 +PKG_RELEASE:=1 PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer -PKG_HASH:=df24e8792691a02dfe003b3833a51f1dbc6c3331ae625d143b17da939ceb5e0a +PKG_HASH:=67c1edf8c3c339cda5dde85f4f7b953bb9607c2d13ae970e2491c5c4c055ef5f PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION) PKG_MAINTAINER:=W. Michael Petullo \ diff --git a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch index 8cf5238ab..bdd6f2254 100644 --- a/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch +++ b/multimedia/gstreamer1/patches/010-gstplugin-use-lazy-symbol-binding.patch @@ -1,6 +1,6 @@ --- a/gst/gstplugin.c +++ b/gst/gstplugin.c -@@ -851,15 +851,8 @@ _priv_gst_plugin_load_file_for_registry +@@ -854,15 +854,8 @@ _priv_gst_plugin_load_file_for_registry } #endif diff --git a/multimedia/gstreamer1/patches/020-distutils.patch b/multimedia/gstreamer1/patches/020-distutils.patch index 7dfbe7d3b..302377854 100644 --- a/multimedia/gstreamer1/patches/020-distutils.patch +++ b/multimedia/gstreamer1/patches/020-distutils.patch @@ -1,6 +1,6 @@ --- a/meson.build +++ b/meson.build -@@ -528,7 +528,7 @@ if get_option('default_library') == 'sta +@@ -527,7 +527,7 @@ if get_option('default_library') == 'sta endif # Used in gst/parse/meson.build and below diff --git a/multimedia/imagemagick/Makefile b/multimedia/imagemagick/Makefile index 53f69720e..8c4e97775 100644 --- a/multimedia/imagemagick/Makefile +++ b/multimedia/imagemagick/Makefile @@ -110,7 +110,7 @@ CONFIGURE_ARGS += \ --with-png \ --with-tiff -TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),,-flto) +TARGET_CFLAGS += $(if $(filter-out 5 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),,-flto) define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index f865d75be..3800b7543 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=motion -PKG_VERSION:=4.3.2 +PKG_VERSION:=4.5.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Motion-Project/motion/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70 +PKG_HASH:=42320a1c7b54a3f0b5a49cecf34a5d752760b28383bc573b3ca1240581786fe5 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) PKG_MAINTAINER:=Roger D @@ -24,6 +24,7 @@ PKG_CPE_ID:=cpe:/a:lavrsen:motion PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=gettext-full/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk diff --git a/multimedia/motion/patches/010-no-po-man.patch b/multimedia/motion/patches/010-no-po-man.patch index 05b8dc446..d8826be82 100644 --- a/multimedia/motion/patches/010-no-po-man.patch +++ b/multimedia/motion/patches/010-no-po-man.patch @@ -10,7 +10,7 @@ sysconf_DATA = \ --- a/configure.ac +++ b/configure.ac -@@ -472,8 +472,6 @@ AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS") +@@ -492,8 +492,6 @@ AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS") AC_CONFIG_FILES([ Makefile src/Makefile diff --git a/net/bind/Makefile b/net/bind/Makefile index bc4a9a877..e53a7e7f8 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind -PKG_VERSION:=9.18.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=9.18.10 +PKG_RELEASE:=1 USERID:=bind=57:bind=57 PKG_MAINTAINER:=Noah Meyerhans @@ -22,7 +22,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:= \ https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \ https://ftp.isc.org/isc/bind9/$(PKG_VERSION) -PKG_HASH:=9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981 +PKG_HASH:=f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=aclocal.m4 libtool.m4 diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index cfe971f9b..32680a2ed 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudflared -PKG_VERSION:=2022.11.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2022.12.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)? -PKG_HASH:=d4b1133057a721087a0a5387ea6d4d1ebf3b1f5135396da25a1e88e873cd5203 +PKG_HASH:=8cc5c41ea98a9d72687d5f62e733a9033191e834e4fa9b2aecc557f0ccfbda56 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/net/cloudreve/Makefile b/net/cloudreve/Makefile index 7de8963a4..feee89f34 100644 --- a/net/cloudreve/Makefile +++ b/net/cloudreve/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudreve -PKG_VERSION:=3.5.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.6.2 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cloudreve/Cloudreve.git PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=c43ec528df19d239b06456e78aae3d9852da5cca372c157b62f1f74b03f5cc0d +PKG_MIRROR_HASH:=134dc707f8befaa9a193a2b0ae2eb2eebd3c5c70c291b5104bed458c63eedbb7 PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE diff --git a/net/dnslookup/Makefile b/net/dnslookup/Makefile index 4d869cf6f..522e49812 100644 --- a/net/dnslookup/Makefile +++ b/net/dnslookup/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnslookup -PKG_VERSION:=1.8.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.8.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ameshkov/dnslookup/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8358291240a27f20f4d635f9a27a9373144b723c4d73ee01374a9ed5c02126bd +PKG_HASH:=51b9cbc626e091eb7a98bc326ad026f36d95f8b5917f71f13011466fcdddb3f9 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index a02447e8f..ee6166d68 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.46.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.46.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5c959bd2f08b2304306b8f0b933b20d31a3a3d1ebeb0f349740799e5089fd4ae +PKG_HASH:=604b7e78956ec6d6421807e30ff44d87d85f10203b3d68d397af34ca2013e696 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/net/krb5/Makefile b/net/krb5/Makefile index 0660515f8..bdad2543b 100644 --- a/net/krb5/Makefile +++ b/net/krb5/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=krb5 -PKG_VERSION:=1.19.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.20.1 +PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -18,8 +18,8 @@ PKG_LICENSE_FILES:=NOTICE PKG_CPE_ID:=cpe:/a:mit:kerberos PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.19 -PKG_HASH:=56d04863cfddc9d9eb7af17556e043e3537d41c6e545610778676cf551b9dcd0 +PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.20 +PKG_HASH:=704aed49b19eb5a7178b34b2873620ec299db08752d6a8574f95d41879ab8851 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch b/net/krb5/patches/001-fix-uninitialized-warning-errors.patch deleted file mode 100644 index 6d1e373dd..000000000 --- a/net/krb5/patches/001-fix-uninitialized-warning-errors.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/src/kadmin/ktutil/ktutil_funcs.c -+++ b/src/kadmin/ktutil/ktutil_funcs.c -@@ -65,7 +65,7 @@ krb5_error_code ktutil_delete(context, l - krb5_kt_list *list; - int idx; - { -- krb5_kt_list lp, prev; -+ krb5_kt_list lp, prev = NULL; - int i; - - for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) { ---- a/src/lib/kadm5/str_conv.c -+++ b/src/lib/kadm5/str_conv.c -@@ -133,7 +133,7 @@ raw_flagspec_to_mask(const char *s, int - { - int found = 0, invert = 0; - size_t i; -- krb5_flags flag; -+ krb5_flags flag = 0; - unsigned long ul; - - for (i = 0; !found && i < NFTBL; i++) { ---- a/src/lib/krad/packet.c -+++ b/src/lib/krad/packet.c -@@ -253,7 +253,7 @@ krad_packet_new_request(krb5_context ctx - { - krb5_error_code retval; - krad_packet *pkt; -- uchar id; -+ uchar id = 0; - size_t attrset_len; - - pkt = packet_new(); ---- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c -+++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c -@@ -3646,7 +3646,7 @@ pkinit_open_session(krb5_context context - { - CK_ULONG i, r; - unsigned char *cp; -- size_t label_len; -+ size_t label_len = 0; - CK_ULONG count = 0; - CK_SLOT_ID_PTR slotlist; - CK_TOKEN_INFO tinfo; ---- a/src/util/profile/prof_file.c -+++ b/src/util/profile/prof_file.c -@@ -270,7 +270,7 @@ errcode_t profile_update_file_data_locke - unsigned long frac; - time_t now; - #endif -- FILE *f; -+ FILE *f = NULL; - int isdir = 0; - - if ((data->flags & PROFILE_FILE_NO_RELOAD) && data->root != NULL) diff --git a/net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch b/net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch deleted file mode 100644 index 55aa7ac1c..000000000 --- a/net/krb5/patches/002_remove_unnecessary_flag_in_macos_build.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 3c66c1fec7ce4edeff284a5e4abe32d0b4398539 -Author: Nikhil Benesch -Date: Wed Dec 22 18:58:17 2021 -0500 - - Remove unnecessary flag in macOS build - - The configuration logic for adding the `-search_paths_first` linker - flag on Darwin does not correctly handle cross compilation. It should - check the value of $krb5_cv_host rather than `uname -s` to detect when - the compilation target is Darwin, rather than the build machine. - - It turns out `-search_paths_first` has been the default behavior of ld - on macOS since XCode 4. So just remove that bit of logic entirely. - (The flag was added in commit acd27af0e845f8b93de2e226cc2ec9ac8af52077 - in 2004; XCode 4 was released in 2010.) - - [ghudson@mit.edu: edited commit message] - ---- a/src/aclocal.m4 -+++ b/src/aclocal.m4 -@@ -585,10 +585,6 @@ if test "$GCC" = yes ; then - CFLAGS="$CFLAGS -fno-common" - ;; - esac -- case "$LD $LDFLAGS" in -- *-Wl,-search_paths_first*) ;; -- *) LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" ;; -- esac - fi - else - if test "`uname -s`" = AIX ; then ---- a/src/configure -+++ b/src/configure -@@ -4978,10 +4978,6 @@ $as_echo "$as_me: disabling the use of c - CFLAGS="$CFLAGS -fno-common" - ;; - esac -- case "$LD $LDFLAGS" in -- *-Wl,-search_paths_first*) ;; -- *) LDFLAGS="${LDFLAGS} -Wl,-search_paths_first" ;; -- esac - fi - else - if test "`uname -s`" = AIX ; then diff --git a/net/natmap/Makefile b/net/natmap/Makefile index 7c09f1716..4f79967ac 100644 --- a/net/natmap/Makefile +++ b/net/natmap/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natmap -PKG_VERSION:=20221203 +PKG_VERSION:=20221225 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/heiher/natmap/releases/download/$(PKG_VERSION) -PKG_HASH:=c7aa0bb1f3e057bf1fa987ad6166ba7c2e80510a89593e04f4fe0f36f1873338 +PKG_HASH:=cc19a5b876fd75424619ae90aa6b0414a438c1f6f55537b9b28f1c23d925f6ff PKG_MAINTAINER:=Richard Yu PKG_LICENSE:=MIT @@ -26,6 +26,10 @@ endef MAKE_FLAGS += REV_ID="$(PKG_VERSION)" +define Package/natmap/conffiles +/etc/config/natmap +endef + define Package/natmap/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/natmap $(1)/usr/bin/ diff --git a/net/natmap/files/natmap.config b/net/natmap/files/natmap.config index 71931f6c5..01328c1bb 100644 --- a/net/natmap/files/natmap.config +++ b/net/natmap/files/natmap.config @@ -8,5 +8,6 @@ config natmap option http_server 'example.com' option port '8080' option forward_target '' + option forward_port '' option notify_script '' diff --git a/net/natmap/files/natmap.init b/net/natmap/files/natmap.init index a9ff90539..a0ec4b26d 100644 --- a/net/natmap/files/natmap.init +++ b/net/natmap/files/natmap.init @@ -17,7 +17,7 @@ load_interfaces() { validate_section_natmap() { uci_load_validate "${NAME}" natmap "$1" "$2" \ - 'enable:bool:1' \ + 'enable:bool:0' \ 'family:string' \ 'udp_mode:bool:0' \ 'interface:string' \ @@ -26,6 +26,7 @@ validate_section_natmap() { 'http_server:host' \ 'port:port' \ 'forward_target:host' \ + 'forward_port:port' \ 'notify_script:file' } @@ -39,15 +40,16 @@ natmap_instance() { procd_open_instance "$1" procd_set_param command "$PROG" \ - ${interval:+-k $interval} \ + ${interval:+-k "$interval"} \ ${stun_server:+-s "$stun_server"} \ - ${http_server:+-h "$http_server"} + ${http_server:+-h "$http_server"} \ + ${port:+-b "$port"} \ [ "${family}" = ipv4 ] && procd_append_param command -4 [ "${family}" = ipv6 ] && procd_append_param command -6 [ "${udp_mode}" = 1 ] && procd_append_param command -u - [ -n "$interface" ] && { + [ -n "${interface}" ] && { local ifname network_get_device ifname "$interface" || ifname="$interface" @@ -55,11 +57,7 @@ natmap_instance() { procd_append_param netdev "$ifname" } - if [ -n "$forward_target" ]; then - procd_append_param command -t "$forward_target" -p $port - else - procd_append_param command -b $port - fi + [ -n "${forward_target}" ] && procd_append_param command -t "$forward_target" -p "$forward_port" [ -n "${notify_script}" ] && procd_set_param env "NOTIFY_SCRIPT=${notify_script}" procd_append_param command -e /usr/lib/natmap/update.sh diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile index cab9d9707..f1879b984 100644 --- a/net/nfdump/Makefile +++ b/net/nfdump/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfdump -PKG_VERSION:=1.6.24 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.6.25 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/phaag/nfdump/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e +PKG_HASH:=811ffab139078c08d922739d20f487c48870749c74a0cd4b14dd126252c4be88 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=BSD-3-Clause diff --git a/net/pbr/Makefile b/net/pbr/Makefile index e5b967ff0..7ec156ac7 100644 --- a/net/pbr/Makefile +++ b/net/pbr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pbr PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin @@ -20,7 +20,7 @@ define Package/pbr/default URL:=https://docs.openwrt.melmac.net/pbr/ DEPENDS:=+ip-full +jshn +jsonfilter +resolveip CONFLICTS:=vpnbypass vpn-policy-routing - PROVIDES:=pbr vpnbypass vpn-policy-routing + PROVIDES:=vpnbypass vpn-policy-routing PKGARCH:=all endef diff --git a/net/pbr/files/etc/init.d/pbr.init b/net/pbr/files/etc/init.d/pbr.init index 3ee9a9b8c..16aae0596 100755 --- a/net/pbr/files/etc/init.d/pbr.init +++ b/net/pbr/files/etc/init.d/pbr.init @@ -264,8 +264,8 @@ is_service_running_nft() { [ -x "$nft" ] && [ -n "$(get_mark_nft_chains)" ]; } # is_service_running_nft() { [ -x "$nft" ] && [ -s "$nftPermFile" ]; } is_service_running() { if is_nft; then is_service_running_nft; else is_service_running_iptables; fi; } is_netifd_table() { local iface="$1"; [ "$(uci -q get "network.${iface}.ip4table")" = "${packageName}_${iface%6}" ]; } -get_rt_tables_id() { grep "${packageName}_${iface}" /etc/iproute2/rt_tables | awk '{print $1;}'; } -get_rt_tables_next_id() { echo "$(($(sort -r -n /etc/iproute2/rt_tables | grep -o -E -m 1 "^[0-9]+")+1))"; } +get_rt_tables_id() { local iface="$1"; grep "${packageName}_${iface}" '/etc/iproute2/rt_tables' | awk '{print $1;}'; } +get_rt_tables_next_id() { echo "$(($(sort -r -n '/etc/iproute2/rt_tables' | grep -o -E -m 1 "^[0-9]+")+1))"; } _check_config() { local en; config_get_bool en "$1" 'enabled' 1; [ "$en" -gt 0 ] && _cfg_enabled=0; } is_config_enabled() { local cfg="$1" _cfg_enabled=1 @@ -1658,12 +1658,16 @@ interface_routing() { $ip_full -6 rule add fwmark "${mark}/${fw_mask}" table "$tid" priority "$priority" || ipv6_error=1 fi else - sed -i "/${ipTablePrefix}_${iface}/d" /etc/iproute2/rt_tables + if ! grep -q "$tid ${ipTablePrefix}_${iface}" '/etc/iproute2/rt_tables'; then + sed -i "/${ipTablePrefix}_${iface}/d" '/etc/iproute2/rt_tables' + sync + echo "$tid ${ipTablePrefix}_${iface}" >> '/etc/iproute2/rt_tables' + sync + fi $ip_full -4 rule del fwmark "${mark}/${fw_mask}" table "$tid" >/dev/null 2>&1 $ip_full -4 route flush table "$tid" >/dev/null 2>&1 if [ -n "$gw4" ] || [ "$strict_enforcement" -ne 0 ]; then ipv4_error=0 - echo "$tid ${ipTablePrefix}_${iface}" >> /etc/iproute2/rt_tables if [ -z "$gw4" ]; then $ip_full -4 route add unreachable default table "$tid" >/dev/null 2>&1 || ipv4_error=1 else @@ -1754,7 +1758,8 @@ EOF $ip_full rule del fwmark "${mark}/${fw_mask}" table "$tid" >/dev/null 2>&1 if ! is_netifd_table "$iface"; then $ip_full route flush table "$tid" >/dev/null 2>&1 - sed -i "/${ipTablePrefix}_${iface}/d" /etc/iproute2/rt_tables + sed -i "/${ipTablePrefix}_${iface}/d" '/etc/iproute2/rt_tables' + sync fi return "$s" ;; diff --git a/net/rclone/Makefile b/net/rclone/Makefile index feb7a39b7..e0b5518fd 100644 --- a/net/rclone/Makefile +++ b/net/rclone/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rclone -PKG_VERSION:=1.60.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.61.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/rclone/rclone/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b0037124c04fd1c31a1d9ae1c80e25555da3a22d7ab1ae714ed2c02247fbdac5 +PKG_HASH:=f9fb7bae1f19896351db64e3713b67bfd151c49b2b28e6c6233adf67dbc2c899 PKG_LICENSE:=MIT PKG_LICENSE_FILE:=LICENSE diff --git a/net/snort3/Makefile b/net/snort3/Makefile index b91ebc6bd..698f28c4a 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.48.0 -PKG_RELEASE:=2 +PKG_VERSION:=3.1.50.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=65df088a8cac11e59f0b71a7f98fc9d21eeb0e31d35280c470c985172947ebfe +PKG_HASH:=983497578587c5b1291994608fef70700d7f251461e79ac897751bba57cc56b5 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only diff --git a/net/snort3/files/local.lua b/net/snort3/files/local.lua index 7929388ba..c48ffd0c8 100644 --- a/net/snort3/files/local.lua +++ b/net/snort3/files/local.lua @@ -2,7 +2,7 @@ -- switch tap to inline in ips and uncomment the below to run snort in inline mode --snort = {} ---snort["-Q"] = '' +--snort["-Q"] = true ips = { mode = tap, @@ -50,3 +50,10 @@ file_policy = { } } } + +-- To use openappid with snort, install the openappid package and uncomment the below +--appid = { +-- app_detector_dir = '/usr/lib/openappid', +-- log_stats = true, +-- app_stats_period = 60, +--} diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 2b2d09c84..35cf0fec1 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.8 -PKG_RELEASE:=$(AUTORELEASE).1 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ @@ -691,7 +691,7 @@ $(eval $(call BuildPlugin,kernel-netlink,netlink kernel interface,)) $(eval $(call BuildPlugin,ldap,LDAP,+PACKAGE_strongswan-mod-ldap:libopenldap)) $(eval $(call BuildPlugin,led,LED blink on IKE activity,)) $(eval $(call BuildPlugin,load-tester,load testing,)) -$(eval $(call BuildPlugin,nonce,nonce genereation,)) +$(eval $(call BuildPlugin,nonce,nonce generation,)) $(eval $(call BuildPlugin,md4,MD4 crypto,)) $(eval $(call BuildPlugin,md5,MD5 crypto,)) $(eval $(call BuildPlugin,mgf1,MGF1 crypto,)) diff --git a/net/stubby/Makefile b/net/stubby/Makefile index bb0b2be54..25af732c6 100644 --- a/net/stubby/Makefile +++ b/net/stubby/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stubby -PKG_VERSION:=0.4.2 +PKG_VERSION:=0.4.3 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME) PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=0a40e3eec2ef86a83977b69f03bc63f232fe52ca15703273a0d097e64fa3bf05 +PKG_MIRROR_HASH:=2fd0bc4db1d6f08be63e8f092939054a5e4e884db9a521d1033f89a8b3f5d132 PKG_MAINTAINER:= PKG_LICENSE:=BSD-3-Clause diff --git a/net/uacme/Makefile b/net/uacme/Makefile index d7d66cff1..34e9ddcda 100644 --- a/net/uacme/Makefile +++ b/net/uacme/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uacme PKG_VERSION:=1.7.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ndilieto/uacme/tar.gz/upstream/$(PKG_VERSION)? diff --git a/net/uacme/files/run.sh b/net/uacme/files/run.sh old mode 100644 new mode 100755 index 556bcc2f9..98871d4ba --- a/net/uacme/files/run.sh +++ b/net/uacme/files/run.sh @@ -37,6 +37,7 @@ NGINX_WEBSERVER=0 UPDATE_NGINX=0 UPDATE_UHTTPD=0 UPDATE_HAPROXY=0 +FW_RULE= USER_CLEANUP= . /lib/functions.sh @@ -135,24 +136,30 @@ pre_checks() esac done - iptables -I input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" || return 1 - debug "v4 input_rule: $(iptables -nvL input_rule)" - if [ -e "/usr/sbin/ip6tables" ]; then - ip6tables -I input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" || return 1 - debug "v6 input_rule: $(ip6tables -nvL input_rule)" - fi + FW_RULE=$(uci add firewall rule) || return 1 + uci set firewall."$FW_RULE".name='uacme: temporarily allow incoming http' + uci set firewall."$FW_RULE".enabled='1' + uci set firewall."$FW_RULE".target='ACCEPT' + uci set firewall."$FW_RULE".src='wan' + uci set firewall."$FW_RULE".proto='tcp' + uci set firewall."$FW_RULE".dest_port='80' + uci commit firewall + /etc/init.d/firewall reload + + debug "added firewall rule: $FW_RULE" return 0 } post_checks() { log "Running post checks (cleanup)." - # The comment ensures we only touch our own rules. If no rules exist, that - # is fine, so hide any errors - iptables -D input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" 2>/dev/null - if [ -e "/usr/sbin/ip6tables" ]; then - ip6tables -D input_rule -p tcp --dport 80 -j ACCEPT -m comment --comment "ACME" 2>/dev/null + # $FW_RULE contains the string to identify firewall rule created earlier + if [ -n "$FW_RULE" ]; then + uci delete firewall."$FW_RULE" + uci commit firewall + /etc/init.d/firewall reload fi + if [ -e /etc/init.d/uhttpd ] && [ "$UPDATE_UHTTPD" -eq 1 ]; then uci commit uhttpd /etc/init.d/uhttpd reload diff --git a/net/v2ray-core/Makefile b/net/v2ray-core/Makefile index add4616bc..115be3064 100644 --- a/net/v2ray-core/Makefile +++ b/net/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=5.2.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea +PKG_HASH:=3594fcec033706cbc94ff76ecf86a44f025164baa5da9b2286dea32f2b6029f9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index c441ce1f4..c77a14bb7 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,22 +12,22 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202211240054 +GEOIP_VER:=202212220043 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:=567c9a1bfe22c2ff7f468f3814aa6bb344b33393cf39507e5cbeb20c78c952b7 + HASH:=2c19f53055777a126a4687feb41dab033180b517de058a0d18b6344c4987f57d endef -GEOSITE_VER:=20221127082021 +GEOSITE_VER:=20221226075817 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:=519583c593fada6cf8d629eb428652199ab715d641073f64122c1e2c68b6c43f + HASH:=7651fe111ed789d3508f2d6bfaa547141beb7bf1d392b57207889c5f6df53e19 endef define Package/v2ray-geodata/template diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index e231bc796..5fb124f6e 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.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.7.0 +PKG_RELEASE:=1 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:=61956d8d72d086fbf83e6a3aff191d010401aca34f30015f839f8a73bf50914c +PKG_HASH:=6dbf3d9103e62f9e72b7ac231e1d5a65e2a5c40810500a7e757a4ef71dcc32fd PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 5ea73c5bf..c857615d5 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.14.1 +PKG_VERSION:=2.14.2 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=4e3e92169ad9142718a168b71dc5027f173be4cdb6563f42c60677818efd7509 +PKG_HASH:=72f25596fdaf3bfbb685460c6003acd7ea904b95f12151f892bb199f985fa285 PKG_MAINTAINER:=Javier Marcet diff --git a/utils/gnupg2/Makefile b/utils/gnupg2/Makefile index ce81a88b9..5982d3d1d 100644 --- a/utils/gnupg2/Makefile +++ b/utils/gnupg2/Makefile @@ -104,7 +104,7 @@ CONFIGURE_ARGS += \ --disable-tests \ --disable-zip -TARGET_CFLAGS += $(if $(CONFIG_GCC_USE_VERSION_10),-DEXTERN_UNLESS_MAIN_MODULE=static) +TARGET_CFLAGS += $(if $(filter-out 5 6 7 8 9,$(word 1,$(subst ., ,$(call qstrip,$(CONFIG_GCC_VERSION))))),-DEXTERN_UNLESS_MAIN_MODULE=static) define Package/gnupg2/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index ba7be6bf6..feafd092e 100644 --- a/utils/lxc/Makefile +++ b/utils/lxc/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lxc PKG_VERSION:=5.0.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://linuxcontainers.org/downloads/lxc/ diff --git a/utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch b/utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch new file mode 100644 index 000000000..89b52fc22 --- /dev/null +++ b/utils/lxc/patches/001-build-detect-where-struct-mount_attr-is-declared.patch @@ -0,0 +1,173 @@ +From c1115e1503bf955c97f4cf3b925a6a9f619764c3 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:14:25 +0200 +Subject: build: detect where struct mount_attr is declared + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 30 ++++++++++++++++++++++++++++-- + src/lxc/conf.c | 6 +++--- + src/lxc/conf.h | 2 +- + src/lxc/mount_utils.c | 6 +++--- + src/lxc/syscall_wrappers.h | 12 ++++++++++-- + 5 files changed, 45 insertions(+), 11 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -589,7 +589,6 @@ decl_headers = ''' + foreach decl: [ + '__aligned_u64', + 'struct clone_args', +- 'struct mount_attr', + 'struct open_how', + 'struct rtnl_link_stats64', + ] +@@ -609,7 +608,6 @@ foreach tuple: [ + ['struct seccomp_notif_sizes'], + ['struct clone_args'], + ['__aligned_u64'], +- ['struct mount_attr'], + ['struct open_how'], + ['struct rtnl_link_stats64'], + ] +@@ -629,6 +627,34 @@ foreach tuple: [ + endif + endforeach + ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (sys/mount.h)' ++else ++ srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (sys/mount.h)' ++endif ++ ++## Types. ++decl_headers = ''' ++#include ++''' ++ ++# We get -1 if the size cannot be determined ++if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) ++ found_types += 'struct mount_attr (linux/mount.h)' ++else ++ srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) ++ missing_types += 'struct mount_attr (linux/mount.h)' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -2885,7 +2885,7 @@ static int __lxc_idmapped_mounts_child(s + struct lxc_mount_options opts = {}; + int dfd_from; + const char *source_relative, *target_relative; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + + ret = parse_lxc_mount_attrs(&opts, mntent.mnt_opts); + if (ret < 0) +@@ -3005,7 +3005,7 @@ static int __lxc_idmapped_mounts_child(s + + /* Set propagation mount options. */ + if (opts.attr.propagation) { +- attr = (struct lxc_mount_attr) { ++ attr = (struct mount_attr) { + .propagation = opts.attr.propagation, + }; + +@@ -4109,7 +4109,7 @@ int lxc_idmapped_mounts_parent(struct lx + + for (;;) { + __do_close int fd_from = -EBADF, fd_userns = -EBADF; +- struct lxc_mount_attr attr = {}; ++ struct mount_attr attr = {}; + struct lxc_mount_options opts = {}; + ssize_t ret; + +--- a/src/lxc/conf.h ++++ b/src/lxc/conf.h +@@ -223,7 +223,7 @@ struct lxc_mount_options { + unsigned long mnt_flags; + unsigned long prop_flags; + char *data; +- struct lxc_mount_attr attr; ++ struct mount_attr attr; + char *raw_options; + }; + +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -31,7 +31,7 @@ lxc_log_define(mount_utils, lxc); + * setting in @attr_set, but must also specify MOUNT_ATTR__ATIME in the + * @attr_clr field. + */ +-static inline void set_atime(struct lxc_mount_attr *attr) ++static inline void set_atime(struct mount_attr *attr) + { + switch (attr->attr_set & MOUNT_ATTR__ATIME) { + case MOUNT_ATTR_RELATIME: +@@ -272,7 +272,7 @@ int create_detached_idmapped_mount(const + { + __do_close int fd_tree_from = -EBADF; + unsigned int open_tree_flags = OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC; +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = MOUNT_ATTR_IDMAP | attr_set, + .attr_clr = attr_clr, + .userns_fd = userns_fd, +@@ -335,7 +335,7 @@ int __fd_bind_mount(int dfd_from, const + __u64 attr_clr, __u64 propagation, int userns_fd, + bool recursive) + { +- struct lxc_mount_attr attr = { ++ struct mount_attr attr = { + .attr_set = attr_set, + .attr_clr = attr_clr, + .propagation = propagation, +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -18,6 +18,12 @@ + #include "macro.h" + #include "syscall_numbers.h" + ++#if HAVE_STRUCT_MOUNT_ATTR ++#include ++#elif HAVE_UAPI_STRUCT_MOUNT_ATTR ++#include ++#endif ++ + #ifdef HAVE_LINUX_MEMFD_H + #include + #endif +@@ -210,16 +216,18 @@ extern int fsmount(int fs_fd, unsigned i + /* + * mount_setattr() + */ +-struct lxc_mount_attr { ++#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++struct mount_attr { + __u64 attr_set; + __u64 attr_clr; + __u64 propagation; + __u64 userns_fd; + }; ++#endif + + #if !HAVE_MOUNT_SETATTR + static inline int mount_setattr(int dfd, const char *path, unsigned int flags, +- struct lxc_mount_attr *attr, size_t size) ++ struct mount_attr *attr, size_t size) + { + return syscall(__NR_mount_setattr, dfd, path, flags, attr, size); + } diff --git a/utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch b/utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch new file mode 100644 index 000000000..677c08fc2 --- /dev/null +++ b/utils/lxc/patches/002-build-detect-sys-pidfd.h-availability.patch @@ -0,0 +1,47 @@ +From ef1e0607b82e27350c2d677d649c6a0a9693fd40 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 16:27:40 +0200 +Subject: build: detect sys/pidfd.h availability + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 1 + + src/lxc/process_utils.h | 6 ++++++ + 2 files changed, 7 insertions(+) + +--- a/meson.build ++++ b/meson.build +@@ -734,6 +734,7 @@ foreach tuple: [ + ['sys/resource.h'], + ['sys/memfd.h'], + ['sys/personality.h'], ++ ['sys/pidfd.h'], + ['sys/signalfd.h'], + ['sys/timerfd.h'], + ['pty.h'], +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -15,6 +15,10 @@ + #include + #include + ++#if HAVE_SYS_PIDFD_H ++#include ++#endif ++ + #include "compiler.h" + #include "syscall_numbers.h" + +@@ -136,9 +140,11 @@ + #endif + + /* waitid */ ++#if !HAVE_SYS_PIDFD_H + #ifndef P_PIDFD + #define P_PIDFD 3 + #endif ++#endif + + #ifndef CLONE_ARGS_SIZE_VER0 + #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ diff --git a/utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch b/utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch new file mode 100644 index 000000000..20d406949 --- /dev/null +++ b/utils/lxc/patches/003-build-check-for-FS_CONFIG_-header-symbol-in-sys-moun.patch @@ -0,0 +1,143 @@ +From cbabe8abf11e7e7fb49c123bae31efdd9bc8f1e8 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Tue, 9 Aug 2022 17:19:40 +0200 +Subject: build: check for FS_CONFIG_* header symbol in sys/mount.h + +Fixes: #4176 +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 59 +++++++++++++++++++++++++++++++++++++++++-- + src/lxc/mount_utils.h | 16 ++++++++++++ + 2 files changed, 73 insertions(+), 2 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -638,8 +638,7 @@ if cc.sizeof('struct mount_attr', prefix + found_types += 'struct mount_attr (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) +- missing_types += 'struct mount_attr (sys/mount.h)' +-endif ++ missing_types += 'struct mount_attr (sys/mount.h)' endif + + ## Types. + decl_headers = ''' +@@ -655,6 +654,62 @@ else + missing_types += 'struct mount_attr (linux/mount.h)' + endif + ++if cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG') ++ srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true) ++ found_types += 'FSCONFIG_SET_FLAG' ++else ++ srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false) ++ missing_types += 'FSCONFIG_SET_FLAG' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_STRING') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_STRING' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_STRING' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_BINARY') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_BINARY' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_BINARY' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_EMPTY') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_PATH_EMPTY' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_PATH_EMPTY' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_FD') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_PATH_FD' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_PATH_FD' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_CREATE') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_CMD_CREATE' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_CMD_CREATE' ++endif ++ ++if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_RECONFIGURE') ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true) ++ found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++else ++ srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false) ++ missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++endif ++ + ## Headers. + foreach ident: [ + ['bpf', '''#include +--- a/src/lxc/mount_utils.h ++++ b/src/lxc/mount_utils.h +@@ -82,37 +82,53 @@ struct lxc_rootfs; + #endif + + /* fsconfig() commands */ ++#if !HAVE_FSCONFIG_SET_FLAG + #ifndef FSCONFIG_SET_FLAG + #define FSCONFIG_SET_FLAG 0 /* Set parameter, supplying no value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_STRING + #ifndef FSCONFIG_SET_STRING + #define FSCONFIG_SET_STRING 1 /* Set parameter, supplying a string value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_BINARY + #ifndef FSCONFIG_SET_BINARY + #define FSCONFIG_SET_BINARY 2 /* Set parameter, supplying a binary blob value */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_PATH + #ifndef FSCONFIG_SET_PATH + #define FSCONFIG_SET_PATH 3 /* Set parameter, supplying an object by path */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_PATH_EMPTY + #ifndef FSCONFIG_SET_PATH_EMPTY + #define FSCONFIG_SET_PATH_EMPTY 4 /* Set parameter, supplying an object by (empty) path */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_SET_FD + #ifndef FSCONFIG_SET_FD + #define FSCONFIG_SET_FD 5 /* Set parameter, supplying an object by fd */ + #endif ++#endif + ++#if !HAVE_FSCONFIG_CMD_CREATE + #ifndef FSCONFIG_CMD_CREATE + #define FSCONFIG_CMD_CREATE 6 /* Invoke superblock creation */ + #endif ++#endif + ++#if !FSCONFIG_CMD_RECONFIGURE + #ifndef FSCONFIG_CMD_RECONFIGURE + #define FSCONFIG_CMD_RECONFIGURE 7 /* Invoke superblock reconfiguration */ + #endif ++#endif + + /* fsmount() flags */ + #ifndef FSMOUNT_CLOEXEC diff --git a/utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch b/utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch new file mode 100644 index 000000000..eb190018b --- /dev/null +++ b/utils/lxc/patches/011-tree-wide-wipe-direct-or-indirect-linux-mount.h-incl.patch @@ -0,0 +1,197 @@ +From 4771699fd97b1e9ee7dc4f7cfe01c8ddd698f682 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Wed, 10 Aug 2022 11:42:52 +0200 +Subject: tree-wide: wipe direct or indirect linux/mount.h inclusion + +It is incompatible with sys/mount.h and causes massive headaches. + +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 44 +++++++++++++------------------------- + src/lxc/macro.h | 13 +++++++++++ + src/lxc/mount_utils.h | 2 +- + src/lxc/syscall_wrappers.h | 9 ++------ + src/lxc/utils.c | 2 -- + 5 files changed, 31 insertions(+), 39 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -627,7 +627,6 @@ foreach tuple: [ + endif + endforeach + +-## Types. + decl_headers = ''' + #include + ''' +@@ -640,74 +639,61 @@ else + srcconf.set10('HAVE_' + 'struct mount_attr'.underscorify().to_upper(), false) + missing_types += 'struct mount_attr (sys/mount.h)' endif + +-## Types. +-decl_headers = ''' +-#include +-''' +- +-# We get -1 if the size cannot be determined +-if cc.sizeof('struct mount_attr', prefix: decl_headers, args: '-D_GNU_SOURCE') > 0 +- srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), true) +- found_types += 'struct mount_attr (linux/mount.h)' +-else +- srcconf.set10('HAVE_UAPI_' + 'struct mount_attr'.underscorify().to_upper(), false) +- missing_types += 'struct mount_attr (linux/mount.h)' +-endif +- ++## Check if sys/mount.h defines the fsconfig commands + if cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG') + srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), true) +- found_types += 'FSCONFIG_SET_FLAG' ++ found_types += 'FSCONFIG_SET_FLAG (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FSCONFIG_SET_FLAG'.underscorify().to_upper(), false) +- missing_types += 'FSCONFIG_SET_FLAG' ++ missing_types += 'FSCONFIG_SET_FLAG (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_STRING') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_STRING' ++ found_types += 'FS_CONFIG_SET_STRING (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_STRING'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_STRING' ++ missing_types += 'FS_CONFIG_SET_STRING (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_BINARY') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_BINARY' ++ found_types += 'FS_CONFIG_SET_BINARY (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_BINARY'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_BINARY' ++ missing_types += 'FS_CONFIG_SET_BINARY (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_EMPTY') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_PATH_EMPTY' ++ found_types += 'FS_CONFIG_SET_PATH_EMPTY (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_EMPTY'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_PATH_EMPTY' ++ missing_types += 'FS_CONFIG_SET_PATH_EMPTY (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_PATH_FD') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_PATH_FD' ++ found_types += 'FS_CONFIG_SET_PATH_FD (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_PATH_FD'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_PATH_FD' ++ missing_types += 'FS_CONFIG_SET_PATH_FD (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_CREATE') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_CMD_CREATE' ++ found_types += 'FS_CONFIG_SET_CMD_CREAT (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_CREATE'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_CMD_CREATE' ++ missing_types += 'FS_CONFIG_SET_CMD_CREATE (sys/mount.h)' + endif + + if cc.has_header_symbol('sys/mount.h', 'FS_CONFIG_SET_CMD_RECONFIGURE') + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), true) +- found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++ found_types += 'FS_CONFIG_SET_CMD_RECONFIGURE (sys/mount.h)' + else + srcconf.set10('HAVE_' + 'FS_CONFIG_SET_CMD_RECONFIGURE'.underscorify().to_upper(), false) +- missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE' ++ missing_types += 'FS_CONFIG_SET_CMD_RECONFIGURE (sys/mount.h)' + endif + + ## Headers. +--- a/src/lxc/macro.h ++++ b/src/lxc/macro.h +@@ -8,6 +8,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -812,4 +813,16 @@ static inline bool is_set(__u32 bit, __u + + #define BIT(nr) (1UL << (nr)) + ++#ifndef FS_IOC_GETFLAGS ++#define FS_IOC_GETFLAGS _IOR('f', 1, long) ++#endif ++ ++#ifndef FS_IOC_SETFLAGS ++#define FS_IOC_SETFLAGS _IOW('f', 2, long) ++#endif ++ ++#ifndef FS_IMMUTABLE_FL ++#define FS_IMMUTABLE_FL 0x00000010 /* Immutable file */ ++#endif ++ + #endif /* __LXC_MACRO_H */ +--- a/src/lxc/mount_utils.h ++++ b/src/lxc/mount_utils.h +@@ -124,7 +124,7 @@ struct lxc_rootfs; + #endif + #endif + +-#if !FSCONFIG_CMD_RECONFIGURE ++#if !HAVE_FSCONFIG_CMD_RECONFIGURE + #ifndef FSCONFIG_CMD_RECONFIGURE + #define FSCONFIG_CMD_RECONFIGURE 7 /* Invoke superblock reconfiguration */ + #endif +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -18,12 +19,6 @@ + #include "macro.h" + #include "syscall_numbers.h" + +-#if HAVE_STRUCT_MOUNT_ATTR +-#include +-#elif HAVE_UAPI_STRUCT_MOUNT_ATTR +-#include +-#endif +- + #ifdef HAVE_LINUX_MEMFD_H + #include + #endif +@@ -216,7 +211,7 @@ extern int fsmount(int fs_fd, unsigned i + /* + * mount_setattr() + */ +-#if !HAVE_STRUCT_MOUNT_ATTR && !HAVE_UAPI_STRUCT_MOUNT_ATTR ++#if !HAVE_STRUCT_MOUNT_ATTR + struct mount_attr { + __u64 attr_set; + __u64 attr_clr; +--- a/src/lxc/utils.c ++++ b/src/lxc/utils.c +@@ -19,8 +19,6 @@ + #include + #include + #include +-/* Needs to be after sys/mount.h header */ +-#include + #include + #include + #include diff --git a/utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch b/utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch new file mode 100644 index 000000000..7ab536e9b --- /dev/null +++ b/utils/lxc/patches/012-tree-wide-use-struct-clone_args-directly.patch @@ -0,0 +1,99 @@ +From 63468abd3287ebd5cc4ed9205334217031049fb4 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Wed, 10 Aug 2022 12:03:54 +0200 +Subject: tree-wide: use struct clone_args directly + +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 1 - + src/lxc/process_utils.c | 2 +- + src/lxc/process_utils.h | 7 ++++--- + src/lxc/start.c | 2 +- + src/lxc/start.h | 1 - + src/tests/reboot.c | 2 -- + 6 files changed, 6 insertions(+), 9 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -582,7 +582,6 @@ decl_headers = ''' + #include + #include + #include +-#include + #include + ''' + +--- a/src/lxc/process_utils.c ++++ b/src/lxc/process_utils.c +@@ -90,7 +90,7 @@ __returns_twice pid_t lxc_raw_legacy_clo + __returns_twice pid_t lxc_raw_clone(unsigned long flags, int *pidfd) + { + pid_t pid; +- struct lxc_clone_args args = { ++ struct clone_args args = { + .flags = flags, + .pidfd = ptr_to_u64(pidfd), + }; +--- a/src/lxc/process_utils.h ++++ b/src/lxc/process_utils.h +@@ -5,7 +5,6 @@ + + #include "config.h" + +-#include + #include + #include + #include +@@ -165,7 +164,8 @@ + #define u64_to_ptr(x) ((void *)(uintptr_t)x) + #endif + +-struct lxc_clone_args { ++#if !HAVE_STRUCT_CLONE_ARGS ++struct clone_args { + __aligned_u64 flags; + __aligned_u64 pidfd; + __aligned_u64 child_tid; +@@ -178,8 +178,9 @@ struct lxc_clone_args { + __aligned_u64 set_tid_size; + __aligned_u64 cgroup; + }; ++#endif + +-__returns_twice static inline pid_t lxc_clone3(struct lxc_clone_args *args, size_t size) ++__returns_twice static inline pid_t lxc_clone3(struct clone_args *args, size_t size) + { + return syscall(__NR_clone3, args, size); + } +--- a/src/lxc/start.c ++++ b/src/lxc/start.c +@@ -1673,7 +1673,7 @@ static int lxc_spawn(struct lxc_handler + } else { + int cgroup_fd = -EBADF; + +- struct lxc_clone_args clone_args = { ++ struct clone_args clone_args = { + .flags = handler->clone_flags, + .pidfd = ptr_to_u64(&handler->pidfd), + .exit_signal = SIGCHLD, +--- a/src/lxc/start.h ++++ b/src/lxc/start.h +@@ -5,7 +5,6 @@ + + #include "config.h" + +-#include + #include + #include + #include +--- a/src/tests/reboot.c ++++ b/src/tests/reboot.c +@@ -32,8 +32,6 @@ + + #include "namespace.h" + +-#include +-#include + #include + + int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...); diff --git a/utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch b/utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch new file mode 100644 index 000000000..cbcd08140 --- /dev/null +++ b/utils/lxc/patches/013-tree-wide-use-struct-open_how-directly.patch @@ -0,0 +1,112 @@ +From 133aa416ca2a5996090ec0e697e253646364d274 Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Wed, 10 Aug 2022 12:18:49 +0200 +Subject: tree-wide: use struct open_how directly + +Signed-off-by: Christian Brauner (Microsoft) +--- + meson.build | 2 -- + src/lxc/file_utils.c | 2 +- + src/lxc/mount_utils.c | 8 ++++---- + src/lxc/syscall_wrappers.h | 6 ++++-- + src/lxc/utils.c | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) + +--- a/meson.build ++++ b/meson.build +@@ -579,9 +579,7 @@ decl_headers = ''' + #include + #include + #include +-#include + #include +-#include + #include + ''' + +--- a/src/lxc/file_utils.c ++++ b/src/lxc/file_utils.c +@@ -652,7 +652,7 @@ int open_at(int dfd, const char *path, u + unsigned int resolve_flags, mode_t mode) + { + __do_close int fd = -EBADF; +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags, + .mode = mode, + .resolve = resolve_flags, +--- a/src/lxc/mount_utils.c ++++ b/src/lxc/mount_utils.c +@@ -186,7 +186,7 @@ int fs_prepare(const char *fs_name, + int fd_from; + + if (!is_empty_string(path_from)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_from, + .resolve = resolve_flags_from, + }; +@@ -237,7 +237,7 @@ int fs_attach(int fd_fs, + int fd_to, ret; + + if (!is_empty_string(path_to)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_to, + .resolve = resolve_flags_to, + }; +@@ -308,7 +308,7 @@ int move_detached_mount(int dfd_from, in + int fd_to, ret; + + if (!is_empty_string(path_to)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_to, + .resolve = resolve_flags_to, + }; +@@ -348,7 +348,7 @@ int __fd_bind_mount(int dfd_from, const + set_atime(&attr); + + if (!is_empty_string(path_from)) { +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = o_flags_from, + .resolve = resolve_flags_from, + }; +--- a/src/lxc/syscall_wrappers.h ++++ b/src/lxc/syscall_wrappers.h +@@ -240,11 +240,13 @@ static inline int mount_setattr(int dfd, + * @mode: O_CREAT/O_TMPFILE file mode. + * @resolve: RESOLVE_* flags. + */ +-struct lxc_open_how { ++#if !HAVE_STRUCT_OPEN_HOW ++struct open_how { + __u64 flags; + __u64 mode; + __u64 resolve; + }; ++#endif + + /* how->resolve flags for openat2(2). */ + #ifndef RESOLVE_NO_XDEV +@@ -296,7 +298,7 @@ struct lxc_open_how { + #define PROTECT_OPEN_RW (O_CLOEXEC | O_NOCTTY | O_RDWR | O_NOFOLLOW) + + #if !HAVE_OPENAT2 +-static inline int openat2(int dfd, const char *filename, struct lxc_open_how *how, size_t size) ++static inline int openat2(int dfd, const char *filename, struct open_how *how, size_t size) + { + return syscall(__NR_openat2, dfd, filename, how, size); + } +--- a/src/lxc/utils.c ++++ b/src/lxc/utils.c +@@ -1095,7 +1095,7 @@ int __safe_mount_beneath_at(int beneath_ + unsigned int flags, const void *data) + { + __do_close int source_fd = -EBADF, target_fd = -EBADF; +- struct lxc_open_how how = { ++ struct open_how how = { + .flags = PROTECT_OPATH_DIRECTORY, + .resolve = PROTECT_LOOKUP_BENEATH_WITH_MAGICLINKS, + }; diff --git a/utils/quota/Makefile b/utils/quota/Makefile index 74b59429c..bb844173a 100644 --- a/utils/quota/Makefile +++ b/utils/quota/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quota -PKG_VERSION:=4.06 +PKG_VERSION:=4.09 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linuxquota -PKG_HASH:=2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d +PKG_HASH:=9cdaca154bc92afc3117f0e5f5b3208dd5f84583af1cf061c39baa0a2bb142f9 PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/quota/patches/010-cdefs.patch b/utils/quota/patches/010-cdefs.patch deleted file mode 100644 index a44978e7e..000000000 --- a/utils/quota/patches/010-cdefs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/quota.h -+++ b/quota.h -@@ -1,7 +1,6 @@ - #ifndef GUARD_QUOTA_H - #define GUARD_QUOTA_H - --#include - #include - #include - -@@ -182,6 +181,6 @@ enum { - #endif - #endif - --long quotactl __P((int, const char *, qid_t, caddr_t)); -+long quotactl (int, const char *, qid_t, caddr_t); - - #endif /* _QUOTA_ */ diff --git a/utils/quota/patches/020-remove-reallocarray.patch b/utils/quota/patches/020-remove-reallocarray.patch deleted file mode 100644 index 75c7a5d9b..000000000 --- a/utils/quota/patches/020-remove-reallocarray.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/quota.c -+++ b/quota.c -@@ -385,7 +385,7 @@ int main(int argc, char **argv) - break; - case 259: - fscount++; -- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); -+ fsnames = realloc(fsnames, fscount * sizeof(char *)); - if (!fsnames) - die(1, _("Not enough memory for filesystem names")); - fsnames[fscount - 1] = optarg; diff --git a/utils/tree/Makefile b/utils/tree/Makefile index 2c161c609..88146217a 100644 --- a/utils/tree/Makefile +++ b/utils/tree/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tree -PKG_VERSION:=2.0.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.1.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Old-Man-Programmer/$(PKG_NAME)/tar.gz/$(PKG_VERSION)? -PKG_HASH:=3ebeaf77a3b3829bcf665329e9d0f3624079c2c4cb4ef14cf6d7129a1a208b59 +PKG_HASH:=e9da64f6bbf894840b76d5fb2d37282076febbc96076fc4e833b08fe42190ad2 PKG_MAINTAINER:=Banglang Huang diff --git a/utils/yq/Makefile b/utils/yq/Makefile index 4bfa4d96b..980f8bb7a 100644 --- a/utils/yq/Makefile +++ b/utils/yq/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yq -PKG_VERSION:=4.30.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.30.6 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=54706926e44ca8f28c74c0165c4746f372daafd4db885b709fdaf5e8f2e4502c +PKG_HASH:=320d0ce36d1dbe703b4cbdb28e9a927c1e87b157e8c05aeb078d6c9c1b0138ea PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT diff --git a/utils/zyxel-reset/Makefile b/utils/zyxel-reset/Makefile new file mode 100644 index 000000000..3839a7102 --- /dev/null +++ b/utils/zyxel-reset/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2022 David Bauer +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=zyxel-reset +PKG_SOURCE_DATE:=2022-12-23 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/blocktrron/zyxel-reset.git +PKG_SOURCE_VERSION:=e1def7b5f117c206afe15aa57ca7433eb972d5d1 +PKG_MIRROR_HASH:=dc02f6afc5d083a7a62ec51b35b352595ef6c99a8192facb1bff7b7f90cec06a + +PKG_MAINTAINER:=David Bauer +PKG_LICENSE:=GPL-2.0-only + +include $(INCLUDE_DIR)/package.mk + +define Package/zyxel-reset + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Trigger factory-reset for ZyXEL APs +endef + +define Package/zyxel-reset/description + This program can trigger a factory-reset on ZyXEL Access Points + running stock-firmware. +endef + +define Package/zyxel-reset/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/zyxel-reset $(1)/usr/bin/zyxel-reset +endef + +$(eval $(call BuildPackage,zyxel-reset))