From b044ba7b37e8166edd2ffe98eaa41ed2c51a45bc Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 1 Jul 2023 17:55:13 -0700 Subject: [PATCH 1/6] treewide: make all GNOME URLs consistent Signed-off-by: Rosen Penev --- libs/json-glib/Makefile | 2 +- libs/libgee/Makefile | 2 +- libs/libsoup/Makefile | 2 +- libs/libsoup3/Makefile | 2 +- libs/totem-pl-parser/Makefile | 2 +- multimedia/grilo-plugins/Makefile | 2 +- multimedia/grilo/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/json-glib/Makefile b/libs/json-glib/Makefile index 908513e9d..0732792a7 100644 --- a/libs/json-glib/Makefile +++ b/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 diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index b7dbabdad..66e6bbf05 100644 --- a/libs/libgee/Makefile +++ b/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 diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile index 6c87fdb11..fd3edbbf1 100644 --- a/libs/libsoup/Makefile +++ b/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 diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile index 846d85d81..fb864644e 100644 --- a/libs/libsoup3/Makefile +++ b/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) diff --git a/libs/totem-pl-parser/Makefile b/libs/totem-pl-parser/Makefile index 08a56b669..626d41232 100644 --- a/libs/totem-pl-parser/Makefile +++ b/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 diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile index 616f34643..f03e4415b 100644 --- a/multimedia/grilo-plugins/Makefile +++ b/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 diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile index 088835074..966adc56b 100644 --- a/multimedia/grilo/Makefile +++ b/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 From d71e28de375edc17ae0e0c6f735a870759c9a3e8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 1 Jul 2023 16:44:54 -0700 Subject: [PATCH 2/6] nginx-util: fix compilation with GCC13 Signed-off-by: Rosen Penev --- net/nginx-util/Makefile | 2 +- net/nginx-util/src/ubus-cxx.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile index 5d7070eb9..4a77e2f20 100644 --- a/net/nginx-util/Makefile +++ b/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 include $(INCLUDE_DIR)/package.mk diff --git a/net/nginx-util/src/ubus-cxx.hpp b/net/nginx-util/src/ubus-cxx.hpp index 6c193cfc3..42d2d21aa 100644 --- a/net/nginx-util/src/ubus-cxx.hpp +++ b/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; From d4ed50045fa39b8abd991debb4ceef1f00bb2003 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 1 Jul 2023 11:31:23 -0700 Subject: [PATCH 3/6] libtins: fix compilation with GCC13 Patch taken from upstream. Signed-off-by: Rosen Penev --- libs/libtins/Makefile | 2 +- libs/libtins/patches/020-gcc13.patch | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 libs/libtins/patches/020-gcc13.patch diff --git a/libs/libtins/Makefile b/libs/libtins/Makefile index b511626bd..ee1e80ecd 100644 --- a/libs/libtins/Makefile +++ b/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)? diff --git a/libs/libtins/patches/020-gcc13.patch b/libs/libtins/patches/020-gcc13.patch new file mode 100644 index 000000000..07b6bd611 --- /dev/null +++ b/libs/libtins/patches/020-gcc13.patch @@ -0,0 +1,21 @@ +From 812be7966d445ec56e88eab512f8fd2d57152427 Mon Sep 17 00:00:00 2001 +From: Vasiliy Glazov +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 + #include + #include +-#include ++#include + #include + #include + From 1dfb94dc017fc6f60e85aa8f01c556671bc5a237 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 1 Jul 2023 17:38:34 -0700 Subject: [PATCH 4/6] sedutil: fix compilation with GCC13 Upstream backport. Signed-off-by: Rosen Penev --- utils/sedutil/Makefile | 2 +- utils/sedutil/patches/010-gcc13.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 utils/sedutil/patches/010-gcc13.patch diff --git a/utils/sedutil/Makefile b/utils/sedutil/Makefile index 9625459d6..64c77232f 100644 --- a/utils/sedutil/Makefile +++ b/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 diff --git a/utils/sedutil/patches/010-gcc13.patch b/utils/sedutil/patches/010-gcc13.patch new file mode 100644 index 000000000..d60984d13 --- /dev/null +++ b/utils/sedutil/patches/010-gcc13.patch @@ -0,0 +1,25 @@ +From b47102bf6066e5342fdbb69bd767cd70a0a59bf9 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +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 ++ + /** Output modes */ + typedef enum _sedutiloutput { + sedutilNormal, From 1b31efc2b2d6454b5444697b64f2e7ecfe6513ec Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Tue, 11 Jul 2023 17:36:05 +0200 Subject: [PATCH 5/6] ocserv: updated to 1.2.0 Signed-off-by: Nikos Mavrogiannopoulos --- net/ocserv/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile index 0bbe4f3b2..e26990fde 100644 --- a/net/ocserv/Makefile +++ b/net/ocserv/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ocserv -PKG_VERSION:=1.1.7 -PKG_RELEASE:=2 +PKG_VERSION:=1.2.0 +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 From 46bf47d855df5f58875f6a76d00825df11c6b5fb Mon Sep 17 00:00:00 2001 From: Dobroslaw Kijowski Date: Tue, 11 Jul 2023 22:49:45 +0200 Subject: [PATCH 6/6] adguardhome: bump to 0.107.33 * Full changelog available at: * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.30 * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.31 * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.32 * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.33 Signed-off-by: Dobroslaw Kijowski --- net/adguardhome/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 53baa8dad..a2622d17d 100644 --- a/net/adguardhome/Makefile +++ b/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