Merge branch 'openwrt:master' into master

2023-04-26 22:37:43 +05:30 · 2023-04-26 22:37:43 +05:30 · 31490d6a29
commit 31490d6a29
parent b631e600f1 1bfd2f7ade
16 changed files with 78 additions and 67 deletions
--- a/lang/python/python-idna/Makefile
+++ b/lang/python/python-idna/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015-2019 OpenWrt.org
+# Copyright (C) 2015-2016, 2018-2020, 2023 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -8,16 +8,18 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-idna
-PKG_VERSION:=3.3
-PKG_RELEASE:=2
+PKG_VERSION:=3.4
+PKG_RELEASE:=1

 PYPI_NAME:=idna
-PKG_HASH:=9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d
+PKG_HASH:=814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4

 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.rst
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>

+PKG_BUILD_DEPENDS:=python-flit-core/host
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
--- a/lang/python/python-pyasn1/Makefile
+++ b/lang/python/python-pyasn1/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2015-2018 OpenWrt.org
+# Copyright (C) 2015, 2018-2020, 2023 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-pyasn1
-PKG_VERSION:=0.4.8
-PKG_RELEASE:=2
+PKG_VERSION:=0.5.0
+PKG_RELEASE:=1

 PYPI_NAME:=pyasn1
-PKG_HASH:=aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba
+PKG_HASH:=97b7290ca68e62a832558ec3976f15cbf911bf5d7c7039d8b861c2a0ece69fde

 PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=LICENSE.txt
+PKG_LICENSE_FILES:=LICENSE.rst
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>

 include ../pypi.mk
@ -26,9 +26,9 @@ define Package/python3-pyasn1
  SECTION:=lang
  CATEGORY:=Languages
  SUBMENU:=Python
-  TITLE:=ASN.1 library for Python
-  URL:=https://github.com/etingof/pyasn1
-  DEPENDS:=+python3-light
+  TITLE:=ASN.1 types and DER/BER/CER codecs (X.208)
+  URL:=https://github.com/pyasn1/pyasn1
+  DEPENDS:=+python3-light +python3-logging
 endef

 define Package/python3-pyasn1/description
--- a/lang/python/python-zope-interface/Makefile
+++ b/lang/python/python-zope-interface/Makefile
@ -1,5 +1,6 @@
 #
-# Copyright (C) 2006-2011, 2015-2018 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2015-2016, 2018-2021, 2023 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@ -8,11 +9,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=python-zope-interface
-PKG_VERSION:=5.4.0
+PKG_VERSION:=6.0
 PKG_RELEASE:=1

 PYPI_NAME:=zope.interface
-PKG_HASH:=5dba5f530fec3f0988d83b78cc591b58c0b6eb8431a85edd1569a0539a8a5a0e
+PKG_HASH:=aab584725afd10c710b8f1e6e208dbee2d0ad009f57d674cb9d1b3964037275d

 PKG_LICENSE:=ZPL-2.1
 PKG_LICENSE_FILES:=LICENSE.txt
--- a/lang/python/python-zope-interface/patches/001-omit-tests.patch
+++ b/lang/python/python-zope-interface/patches/001-omit-tests.patch
@ -1,6 +1,6 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -125,7 +125,7 @@ setup(name='zope.interface',
+@@ -124,7 +124,7 @@ setup(name='zope.interface',
           "Framework :: Zope :: 3",
           "Topic :: Software Development :: Libraries :: Python Modules",
       ],
@ -9,7 +9,7 @@
       package_dir={'': 'src'},
       namespace_packages=["zope"],
       cmdclass={
-@@ -133,6 +133,7 @@ setup(name='zope.interface',
+@@ -132,6 +132,7 @@ setup(name='zope.interface',
       },
       test_suite='zope.interface.tests',
       include_package_data=True,
--- a/lang/python/python3-find-stdlib-depends.sh
+++ b/lang/python/python3-find-stdlib-depends.sh
@ -14,11 +14,10 @@ python3-cgi: cgi
 python3-cgitb: cgitb
 python3-codecs: unicodedata
 python3-ctypes: ctypes
-python3-dbm: dbm
+python3-dbm: dbm dbm.dumb dbm.gnu dbm.ndbm
 python3-decimal: decimal
 python3-distutils: distutils
 python3-email: email
-python3-gdbm: dbm.gnu
 python3-logging: logging
 python3-lzma: lzma
 python3-multiprocessing: multiprocessing
@ -29,6 +28,7 @@ python3-readline: readline
 python3-sqlite3: sqlite3
 python3-unittest: unittest
 python3-urllib: urllib
+python3-uuid: uuid
 python3-xml: xml xmlrpc
 "

--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@ -39,17 +39,8 @@ HOST_CONFIGURE_ARGS += \
 	--disable-install-rdoc \
 	--disable-install-capi \
 	--without-gmp \
-	--with-out-ext=-test-/array/resize,-test-/bignum,-test-/bug-3571,-test-/bug-5832,-test-/bug_reporter,-test-/class,-test-/debug,-test-/dln/empty,-test-/exception,-test-/fatal,-test-/file,-test-/float,-test-/funcall,-test-/gvl/call_without_gvl,-test-/hash,-test-/integer,-test-/iseq_load,-test-/iter,-test-/load/dot.dot,-test-/marshal/compat,-test-/marshal/internal_ivar,-test-/marshal/usr,-test-/memory_status,-test-/method,-test-/notimplement,-test-/num2int,-test-/path_to_class,-test-/popen_deadlock,-test-/postponed_job,-test-/printf,-test-/proc,-test-/rational,-test-/recursion,-test-/st/foreach,-test-/st/numhash,-test-/st/update,-test-/string,-test-/struct,-test-/symbol,-test-/time,-test-/tracepoint,-test-/typeddata,-test-/vm,-test-/wait_for_single_fd,-test-/win32/console,-test-/win32/dln,-test-/win32/fd_setsize,bigdecimal,cgi/escape,continuation,coverage,etc,fcntl,fiddle,io/console,json,json/generator,json/parser,mathn/complex,mathn/rational,nkf,objspace,pty,racc/cparse,rbconfig/sizeof,readline,rubyvm,syslog,win32,win32ole,win32/resolv
-
-# Does not compile with this. Workaround is --without-gmp
-# https://bugs.ruby-lang.org/issues/11940
-	#--with-static-linked-ext \
-
-# even not used, host build with restricted exts results in gems not being
-# compiled for target (probably some cross compiling problem like checking
-# host for selecting target features)
-#	--with-out-ext \
-#	--with-ext=thread,stringio \
+	--with-static-linked-ext \
+	--with-out-ext=-test-/*,bigdecimal,cgi/escape,continuation,coverage,etc,fcntl,fiddle,io/console,json,json/generator,json/parser,mathn/complex,mathn/rational,nkf,objspace,pty,racc/cparse,rbconfig/sizeof,readline,rubyvm,syslog,win32,win32ole,win32/resolv

 HOST_BUILD_DEPENDS:=yaml/host

--- a/libs/pcre2/Makefile
+++ b/libs/pcre2/Makefile
@ -57,7 +57,7 @@ define Package/libpcre2-32
 endef

 CMAKE_HOST_OPTIONS += \
-	-DBUILD_SHARED_LIBS=ON \
+	-DBUILD_SHARED_LIBS=OFF \
 	-DPCRE2_BUILD_PCRE2_8=ON \
 	-DPCRE2_BUILD_PCRE2_16=ON \
 	-DPCRE2_BUILD_PCRE2_32=ON \
--- a/libs/yaml/Makefile
+++ b/libs/yaml/Makefile
@ -36,6 +36,8 @@ endef

 TARGET_CFLAGS += $(FPIC)

+HOST_CONFIGURE_ARGS += --disable-shared
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/yaml.h $(1)/usr/include/
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=iperf
-PKG_VERSION:=2.1.8
-PKG_RELEASE:=3
+PKG_VERSION:=2.1.9
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=8e2cf2fbc9d0d4d1cf9d109b1e328459f9622993dc9a4c5a7dc8a2088fb7beaf
+PKG_HASH:=5c0771aab00ef14520013aef01675977816e23bb8f5d9fde016f90eb2f1be788
 PKG_SOURCE_URL:=@SF/iperf2

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
--- a/net/iperf3/Makefile
+++ b/net/iperf3/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=iperf
-PKG_VERSION:=3.12
+PKG_VERSION:=3.13
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf
-PKG_HASH:=72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6
+PKG_HASH:=bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865

 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=BSD-3-Clause
--- a/net/librespeed-go/Makefile
+++ b/net/librespeed-go/Makefile
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=librespeed-go
 PKG_VERSION:=1.1.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/librespeed/speedtest-go/tar.gz/v$(PKG_VERSION)?
--- a/net/librespeed-go/files/librespeed-go.init
+++ b/net/librespeed-go/files/librespeed-go.init
@ -8,6 +8,31 @@ CONF="librespeed-go"
 PROG="/usr/bin/librespeed-go"
 TMPCONF="/var/run/$CONF/settings.json"

+mount_jail_file() {
+	local cfg="$1"
+	local isdir="${2:-0}"
+	local rw="${3:-0}"
+
+	local value
+	config_get value "config" "$cfg"
+	[ -n "$value" ] || return 1
+
+	if [ "$isdir" = "1" ]; then
+		mkdir -p "$value"
+		chown -R librespeed "$value"
+	else
+		mkdir -p "${value%/*}"
+		touch "$value"
+		chown librespeed "$value"
+	fi
+
+	if [ "$rw" = "1" ]; then
+		procd_add_jail_mount_rw "$value"
+	else
+		procd_add_jail_mount "$value"
+	fi
+}
+
 start_service() {
 	config_load "$CONF"

@ -32,14 +57,7 @@ start_service() {
 	}
 	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
+	chown librespeed "$TMPCONF"

 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
@ -53,15 +71,11 @@ start_service() {

 	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"
+	mount_jail_file "assets_path" "1"
+	mount_jail_file "database_file" "0" "1"
+	mount_jail_file "tls_cert_file"
+	mount_jail_file "tls_key_file"

 	procd_close_instance
 }
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=openssh
 PKG_VERSION:=9.3p1
-PKG_RELEASE:=1
+PKG_RELEASE:=2

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@ -105,6 +105,7 @@ define Package/openssh-server/conffiles
 /etc/ssh/ssh_host_ed25519_key.pub
 /etc/ssh/ssh_host_rsa_key
 /etc/ssh/ssh_host_rsa_key.pub
+/root/.ssh/authorized_keys
 endef

 define Package/openssh-server-pam
--- a/net/strongswan/Makefile
+++ b/net/strongswan/Makefile
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=strongswan
 PKG_VERSION:=5.9.10
-PKG_RELEASE:=4
+PKG_RELEASE:=5

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
@ -39,6 +39,7 @@ PKG_MOD_AVAILABLE:= \
 	des \
 	dhcp \
 	dnskey \
+	drbg \
 	duplicheck \
 	eap-identity \
 	eap-md5 \
@ -54,12 +55,12 @@ PKG_MOD_AVAILABLE:= \
 	gmpdh \
 	ha \
 	hmac \
+	kdf \
 	kernel-libipsec \
 	kernel-netlink \
 	ldap \
 	led \
 	load-tester \
-	nonce \
 	md4 \
 	md5 \
 	mgf1 \
@ -200,7 +201,6 @@ $(call Package/strongswan/Default)
 	+strongswan-mod-ldap \
 	+strongswan-mod-led \
 	+strongswan-mod-load-tester \
-	+strongswan-mod-nonce \
 	+strongswan-mod-md4 \
 	+strongswan-mod-md5 \
 	+strongswan-mod-mgf1 \
@ -272,7 +272,6 @@ $(call Package/strongswan/Default)
 	+strongswan-mod-kernel-netlink \
 	+strongswan-mod-md5 \
 	+strongswan-mod-mgf1 \
-	+strongswan-mod-nonce \
 	+strongswan-mod-pem \
 	+strongswan-mod-pgp \
 	+strongswan-mod-pkcs1 \
@ -312,7 +311,6 @@ $(call Package/strongswan/Default)
 	+strongswan-mod-kernel-netlink \
 	+strongswan-mod-md5 \
 	+strongswan-mod-mgf1 \
-	+strongswan-mod-nonce \
 	+strongswan-mod-pubkey \
 	+strongswan-mod-random \
 	+strongswan-mod-sha1 \
@ -341,7 +339,6 @@ $(call Package/strongswan/Default)
 	@(PACKAGE_strongswan-mod-kdf||PACKAGE_strongswan-mod-openssl||PACKAGE_strongswan-mod-wolfssl) \
 	+strongswan-mod-kernel-netlink \
 	+strongswan-mod-mgf1 \
-	+strongswan-mod-nonce \
 	+strongswan-mod-pubkey \
 	+strongswan-mod-random \
 	+strongswan-mod-sha1 \
@ -470,6 +467,7 @@ CONFIGURE_ARGS+= \
 	--disable-scripts \
 	--disable-static \
 	--disable-fast \
+	--enable-nonce \
 	--enable-mgf1 \
 	--enable-mediation \
 	--with-systemdsystemunitdir=no \
@ -493,8 +491,11 @@ define Package/strongswan/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/strongswan.conf $(1)/etc/
 	echo -e "\ninclude /var/ipsec/strongswan.conf" >> $(1)/etc/strongswan.conf
-	$(INSTALL_DIR) $(1)/usr/lib/ipsec
+	$(INSTALL_DIR) $(1)/etc/strongswan.d/charon
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/strongswan.d/charon/nonce.conf $(1)/etc/strongswan.d/charon/
+	$(INSTALL_DIR) $(1)/usr/lib/ipsec/plugins
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/libstrongswan.so.* $(1)/usr/lib/ipsec/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/ipsec/plugins/libstrongswan-nonce.so $(1)/usr/lib/ipsec/plugins/
 endef

 define Package/strongswan-default/install
@ -700,7 +701,6 @@ $(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 generation,))
 $(eval $(call BuildPlugin,md4,MD4 crypto,))
 $(eval $(call BuildPlugin,md5,MD5 crypto,))
 $(eval $(call BuildPlugin,mgf1,MGF1 crypto,))
--- a/utils/gzip/Makefile
+++ b/utils/gzip/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gzip
-PKG_VERSION:=1.11
+PKG_VERSION:=1.12
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/gzip
-PKG_HASH:=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
+PKG_HASH:=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_CPE_ID:=cpe:/a:gnu:gzip

--- a/utils/kmod/Makefile
+++ b/utils/kmod/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=kmod
-PKG_VERSION:=27
-PKG_RELEASE:=2
+PKG_VERSION:=30
+PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kmod
-PKG_HASH:=c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c
+PKG_HASH:=f897dd72698dc6ac1ef03255cd0a5734ad932318e4adbaebc7338ef2f5202f9f

 PKG_MAINTAINER:=Jeff Waugh <jdub@bethesignal.org>
 PKG_LICENSE:=LGPL-2.1-or-later