Merge branch 'openwrt:master' into master

libs/json-glib/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.6.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/json-glib/1.6
+PKG_SOURCE_URL:=@GNOME/json-glib/$(basename $(PKG_VERSION))
 PKG_HASH:=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 PKG_LICENSE:=LGPL-2.1-or-later

libs/libgee/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=0.20.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/libgee/0.20
+PKG_SOURCE_URL:=@GNOME/libgee/$(basename $(PKG_VERSION))
 PKG_HASH:=1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

libs/libsoup/Makefile

@@ -10,7 +10,7 @@ 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_SOURCE_URL:=@GNOME/libsoup/$(basename $(PKG_VERSION))
 PKG_HASH:=e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

libs/libsoup3/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=3.4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/libsoup/3.4
+PKG_SOURCE_URL:=@GNOME/libsoup/$(basename $(PKG_VERSION))
 PKG_HASH:=78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3
 PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION)
 

libs/libtins/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtins
 PKG_VERSION:=4.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/mfontanini/libtins/tar.gz/v$(PKG_VERSION)?

libs/libtins/patches/020-gcc13.patch

@@ -0,0 +1,21 @@
+From 812be7966d445ec56e88eab512f8fd2d57152427 Mon Sep 17 00:00:00 2001
+From: Vasiliy Glazov <vascom2@gmail.com>
+Date: Tue, 24 Jan 2023 19:29:36 +0300
+Subject: [PATCH] Fix build with GCC13 (#496)
+
+Due to changes in GCC13 need fix include.
+---
+ include/tins/ip_address.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/tins/ip_address.h
++++ b/include/tins/ip_address.h
+@@ -33,7 +33,7 @@
+ #include <string>
+ #include <iosfwd>
+ #include <functional>
+-#include <stdint.h>
++#include <cstdint>
+ #include <tins/cxxstd.h>
+ #include <tins/macros.h>
+ 

libs/totem-pl-parser/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=3.26.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=totem-pl-parser-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://download.gnome.org/sources/totem-pl-parser/3.26/
+PKG_SOURCE_URL:=@GNOME/totem-pl-parser/$(basename $(PKG_VERSION))
 PKG_HASH:=c0df0f68d5cf9d7da43c81c7f13f11158358368f98c22d47722f3bd04bd3ac1c
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

multimedia/grilo-plugins/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=0.3.16
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/
+PKG_SOURCE_URL:=@GNOME/grilo-plugins/$(basename $(PKG_VERSION))
 PKG_HASH:=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

multimedia/grilo/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=0.3.16
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/grilo/0.3/
+PKG_SOURCE_URL:=@GNOME/grilo/$(basename $(PKG_VERSION))
 PKG_HASH:=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>

net/adguardhome/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.29
+PKG_VERSION:=0.107.33
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
-PKG_MIRROR_HASH:=71fcd316171042fe328ca9764eca21d230e9549c32bac95db71414f54dc15379
+PKG_MIRROR_HASH:=924c549a924b66d087d82b6c1402e4928ef176a9f742f3482cb92156956ee1fd
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt

net/nginx-util/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx-util
 PKG_VERSION:=1.6
-PKG_RELEASE:=18
+PKG_RELEASE:=19
 PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
 
 include $(INCLUDE_DIR)/package.mk

net/nginx-util/src/ubus-cxx.hpp

@@ -159,7 +159,7 @@ class message {
             both = keys;
         }
         both = concat(std::move(both), std::move(key_filter)...);
-        return std::move(message{msg, std::move(both)});
+        return message{msg, std::move(both)};
     }
 
     inline ~message() = default;

net/ocserv/Makefile

@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
-PKG_VERSION:=1.1.7
+PKG_VERSION:=1.2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 PKG_BUILD_FLAGS:=no-mips16
 
 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/
-PKG_HASH:=f30f7515e1e569ca2e68a96fa5e3dd10d49a18a40c981ad95b484d10835e3aa6
+PKG_HASH:=47a66e504a6b04bb04856176d78ee392ad1385d22d1670d4ed48b7b95e9dffc5
 
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING

utils/sedutil/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sedutil
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/Drive-Trust-Alliance/sedutil

utils/sedutil/patches/010-gcc13.patch

@@ -0,0 +1,25 @@
+From b47102bf6066e5342fdbb69bd767cd70a0a59bf9 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Sun, 19 Feb 2023 21:28:10 -0500
+Subject: [PATCH] Fix build with GCC 13
+
+As in previous versions, libstdc++ in GCC 13 has trimmed internal
+inclusion of standard headers, necessitating their proper inclusion
+when used:
+
+https://gcc.gnu.org/gcc-13/porting_to.html
+---
+ Common/DtaOptions.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/Common/DtaOptions.h
++++ b/Common/DtaOptions.h
+@@ -21,6 +21,8 @@ along with sedutil.  If not, see <http:/
+ #ifndef _DTAOPTIONS_H
+ #define	_DTAOPTIONS_H
+ 
++#include <stdint.h>
++
+ /** Output modes */
+ typedef enum _sedutiloutput {
+ 	sedutilNormal,