Merge branch 'openwrt:master' into master

2023-05-16 08:34:28 +05:30 · 2023-05-16 08:34:28 +05:30 · 5368a89e2e
commit 5368a89e2e
parent c91693d848 60077281fe
8 changed files with 73 additions and 83 deletions
--- a/lang/python/python-incremental/Makefile
+++ b/lang/python/python-incremental/Makefile
@ -18,6 +18,8 @@ PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>

+HOST_BUILD_DEPENDS:=python3/host python-build/host python-installer/host python-wheel/host
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/host-build.mk
--- a/libs/libunistring/Makefile
+++ b/libs/libunistring/Makefile
@ -1,59 +0,0 @@
-#
-# Copyright (C) 2006-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libunistring
-PKG_VERSION:=1.1
-PKG_RELEASE:=1
-PKG_HASH:=827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNU/libunistring
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libunistring
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libunistring
-  URL:=http://www.gnu.org/software/libunistring/
-endef
-
-define Package/libunistring/description
-  This library provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--enable-static \
-	--without-libiconv-prefix \
-	--without-libpth-prefix
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/include/unistring
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/unistring/*.h $(1)/usr/include/unistring/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunistring.{a,so*} $(1)/usr/lib/
-endef
-
-define Package/libunistring/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libunistring.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libunistring))
--- a/net/jool/patches/100-fix-compilation-warning-simple-fix.patch
+++ b/net/jool/patches/100-fix-compilation-warning-simple-fix.patch
@ -0,0 +1,37 @@
+--- a/src/mod/common/skbuff.c
+++ b/src/mod/common/skbuff.c
+@@ -109,9 +109,9 @@ static void print_skb_fields(struct sk_buff *skb, unsigned int tabs)
+ 	print(tabs, "network_header:%u", skb->network_header);
+ 	print(tabs, "mac_header:%u", skb->mac_header);
+ 	print(tabs, "head:%p", skb->head);
+-	print(tabs, "data:%ld", skb->data - skb->head);
+-	print(tabs, "tail:%u", skb->tail);
+-	print(tabs, "end:%u", skb->end);
+	print(tabs, "data:%ld", (long int)(skb->data - skb->head));
+	print(tabs, "tail:%u", (unsigned int)skb->tail);
+	print(tabs, "end:%u", (unsigned int)skb->end);
+ }
+ 
+ static int truncated(unsigned int tabs)
+--- a/src/mod/common/xlator.c
+++ b/src/mod/common/xlator.c
+@@ -875,7 +875,7 @@ void xlator_put(struct xlator *jool)
+ static bool offset_equals(struct instance_entry_usr *offset,
+ 		struct jool_instance *instance)
+ {
+-	return (offset->ns == ((__u64)instance->jool.ns & 0xFFFFFFFF))
+	return (offset->ns == ((uintptr_t)instance->jool.ns & 0xFFFFFFFF))
+ 			&& (strcmp(offset->iname, instance->jool.iname) == 0);
+ }
+ 
+--- a/src/mod/common/nl/instance.c
+++ b/src/mod/common/nl/instance.c
+@@ -37,7 +37,7 @@ static int serialize_instance(struct xlator *entry, void *arg)
+ 	if (!root)
+ 		return 1;
+ 
+-	error = nla_put_u32(skb, JNLAIE_NS, ((__u64)entry->ns) & 0xFFFFFFFF);
+	error = nla_put_u32(skb, JNLAIE_NS, ((uintptr_t)entry->ns) & 0xFFFFFFFF);
+ 	if (error)
+ 		goto cancel;
+ 	error = nla_put_u8(skb, JNLAIE_XF, xlator_flags2xf(entry->flags));
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=transmission
-PKG_VERSION:=4.0.2
+PKG_VERSION:=4.0.3
 PKG_RELEASE:=1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/transmission/transmission/releases/download/$(PKG_VERSION)/
-PKG_HASH:=39bf7a104a722805a9dc089cdaaffe33bf90b82230a7ea7f340cae59f00a2ee8
+PKG_HASH:=b6b01fd58e42bb14f7aba0253db932ced050fcd2bba5d9f8469d77ddd8ad545a

 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 PKG_LICENSE:=GPL-2.0-or-later
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=xtables-addons
-PKG_VERSION:=3.21
+PKG_VERSION:=3.24
 PKG_RELEASE:=1
-PKG_HASH:=2e09ac129a14f5e9c23b115ebcdfff4aa84e2aeba1268dbdf39b2d752bd71e19
+PKG_HASH:=3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://inai.de/files/xtables-addons/
--- a/net/xtables-addons/patches/001-fix-kernel-version-detection.patch
+++ b/net/xtables-addons/patches/001-fix-kernel-version-detection.patch
@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -42,7 +42,7 @@ regular_CFLAGS="-Wall -Waggregate-return
+@@ -41,7 +41,7 @@ regular_CFLAGS="-Wall -Waggregate-return
 
 AS_IF([test -n "$kbuilddir"], [
 	AC_MSG_CHECKING([kernel version that we will build against])
--- a/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
+++ b/net/xtables-addons/patches/100-add-rtsp-conntrack.patch
@ -1725,7 +1725,7 @@
 +module_exit(fini);
 --- a/extensions/Kbuild
 +++ b/extensions/Kbuild
-@@ -27,6 +27,7 @@ obj-${build_lscan}       += xt_lscan.o
+@@ -28,6 +28,7 @@ obj-${build_lscan}       += xt_lscan.o
 obj-${build_pknock}      += pknock/
 obj-${build_psd}         += xt_psd.o
 obj-${build_quota2}      += xt_quota2.o
@ -1735,7 +1735,7 @@
 -include ${M}/Kbuild.*
 --- a/mconfig
 +++ b/mconfig
-@@ -23,3 +23,4 @@ build_lscan=m
+@@ -24,3 +24,4 @@ build_lscan=m
 build_pknock=m
 build_psd=m
 build_quota2=m
--- a/net/xtables-addons/patches/200-add-lua-packetscript.patch
+++ b/net/xtables-addons/patches/200-add-lua-packetscript.patch
@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/extensions/LUA/byte_array.c
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,161 @@
 +/*
 + *	Copyright (C) 2010 University of Basel <http://cn.cs.unibas.ch/>
 + *	by Andre Graf <andre@dergraf.org>
@ -110,12 +110,26 @@
 +static int32_t byte_array_to_string(lua_State *L)
 +{
 +	lua_packet_segment * array = checkbytearray(L, 1);
-+	uint8_t buf[(array->length * 3) + 255];
 +	uint8_t hexval[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-+	char res[255 + (array->length * 3)]; /* make sure the buffer is big enough*/
+	uint8_t * buf;
+	char * res;
 +	int32_t i, n;
 +	uint8_t *ptr = array->start + array->offset;
 +
+	buf = kcalloc((array->length * 3) + 255, sizeof(*buf), GFP_KERNEL);
+
+	if (!buf) {
+		return luaL_error(L, "byte_array_to_string, failed alloc buf buffer");
+	}
+
+	/* make sure the buffer is big enough*/
+	res = kcalloc((array->length * 3) + 255, sizeof(*res), GFP_KERNEL);
+
+	if (!res) {
+		kfree(buf);
+		return luaL_error(L, "byte_array_to_string, failed alloc res buffer");
+	}
+
 +	for (i = 0; i < array->length; i++) {
 +		buf[i * 3] = hexval[(ptr[i] >> 4) & 0xF];
 +		buf[(i * 3) + 1] = hexval[ptr[i] & 0x0F];
@ -126,6 +140,8 @@
 +	n = sprintf(res, "byte_array: length: %d  value: %s", array->length, buf);
 +
 +	lua_pushlstring(L, res, n);
+	kfree(res);
+	kfree(buf);
 +
 +	return 1;
 +}
@ -2453,15 +2469,13 @@
 +#endif
 --- /dev/null
 +++ b/extensions/LUA/lua/lauxlib.c
-@@ -0,0 +1,674 @@
+@@ -0,0 +1,672 @@
 +/*
 +** $Id: lauxlib.c,v 1.159.1.3 2008/01/21 13:20:51 roberto Exp $
 +** Auxiliary functions for building Lua libraries
 +** See Copyright Notice in lua.h
 +*/
 +
-+#include <stdarg.h>
-+
 +#if !defined(__KERNEL__)
 +#include <ctype.h>
 +#include <errno.h>
@ -4887,7 +4901,7 @@
 +#endif
 --- /dev/null
 +++ b/extensions/LUA/lua/ldebug.c
-@@ -0,0 +1,637 @@
+@@ -0,0 +1,636 @@
 +/*
 +** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $
 +** Debug Interface
@ -4895,7 +4909,6 @@
 +*/
 +
 +
-+#include <stdarg.h>
 +#include <stddef.h>
 +#include <string.h>
 +
@ -6204,7 +6217,7 @@
 +
 +static void DumpString(const TString* s, DumpState* D)
 +{
-+ if (s==NULL || getstr(s)==NULL)
+ if (s==NULL)
 + {
 +  size_t size=0;
 +  DumpVar(size,D);
@ -8165,15 +8178,13 @@
 +
 --- /dev/null
 +++ b/extensions/LUA/lua/lobject.c
-@@ -0,0 +1,215 @@
+@@ -0,0 +1,213 @@
 +/*
 +** $Id: lobject.c,v 2.22.1.1 2007/12/27 13:02:25 roberto Exp $
 +** Some generic functions over Lua objects
 +** See Copyright Notice in lua.h
 +*/
 +
-+#include <stdarg.h>
-+
 +#include <ctype.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@ -13851,7 +13862,7 @@
 +
 --- /dev/null
 +++ b/extensions/LUA/lua/lua.h
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,386 @@
 +/*
 +** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $
 +** Lua - An Extensible Extension Language
@ -13863,7 +13874,6 @@
 +#ifndef lua_h
 +#define lua_h
 +
-+#include <stdarg.h>
 +#include <stddef.h>
 +
 +#include "luaconf.h"
@ -18134,7 +18144,7 @@
 +
 --- a/extensions/Kbuild
 +++ b/extensions/Kbuild
-@@ -28,6 +28,7 @@ obj-${build_pknock}      += pknock/
+@@ -29,6 +29,7 @@ obj-${build_pknock}      += pknock/
 obj-${build_psd}         += xt_psd.o
 obj-${build_quota2}      += xt_quota2.o
 obj-${build_rtsp}        += rtsp/
@ -18144,14 +18154,14 @@
 -include ${M}/Kbuild.*
 --- a/extensions/Mbuild
 +++ b/extensions/Mbuild
-@@ -23,3 +23,4 @@ obj-${build_pknock}      += pknock/
+@@ -24,3 +24,4 @@ obj-${build_pknock}      += pknock/
 obj-${build_psd}         += libxt_psd.so
 obj-${build_quota2}      += libxt_quota2.so
 obj-${build_gradm}       += libxt_gradm.so
 +obj-${build_LUA}         += LUA/
 --- a/mconfig
 +++ b/mconfig
-@@ -24,3 +24,4 @@ build_pknock=m
+@@ -25,3 +25,4 @@ build_pknock=m
 build_psd=m
 build_quota2=m
 build_rtsp=m