diff --git a/fullconenat-nft/Makefile b/fullconenat-nft/Makefile index b1ef68cfe..0c648b903 100644 --- a/fullconenat-nft/Makefile +++ b/fullconenat-nft/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fullconenat-nft -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/fullcone-nat-nftables/nft-fullcone.git diff --git a/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch b/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch new file mode 100644 index 000000000..b7af60455 --- /dev/null +++ b/fullconenat-nft/patches/010-fix-build-with-kernel-6.12.patch @@ -0,0 +1,14 @@ +--- a/src/nft_ext_fullcone.c ++++ b/src/nft_ext_fullcone.c +@@ -121,7 +121,11 @@ static int exp_event_cb(unsigned int eve + } + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0) ++static int nft_fullcone_validate(const struct nft_ctx *ctx, const struct nft_expr *expr) ++#else + static int nft_fullcone_validate(const struct nft_ctx *ctx, const struct nft_expr *expr, const struct nft_data **data) ++#endif + { + int err; + diff --git a/libnftnl/Makefile b/libnftnl/Makefile index 668abca51..054c2a82a 100644 --- a/libnftnl/Makefile +++ b/libnftnl/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl PKG_CPE_ID:=cpe:/a:netfilter:libnftnl PKG_VERSION:=1.2.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files diff --git a/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch b/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch index 0cbb452a4..3bdfdfe82 100644 --- a/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch +++ b/libnftnl/patches/001-libnftnl-add-fullcone-expression-support.patch @@ -66,9 +66,9 @@ Signed-off-by: Syrone Wong expr/socket.c \ --- /dev/null +++ b/src/expr/fullcone.c -@@ -0,0 +1,172 @@ +@@ -0,0 +1,174 @@ +/* -+ * (C) 2022 wongsyrone ++ * (C) 2022-2025 wongsyrone + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published @@ -111,6 +111,8 @@ Signed-off-by: Syrone Wong + case NFTNL_EXPR_FULLCONE_REG_PROTO_MAX: + memcpy(&fullcone->sreg_proto_max, data, data_len); + break; ++ default: ++ return -1; + } + return 0; +} diff --git a/luci-app-filebrowser/po/fi/filebrowser.po b/luci-app-filebrowser/po/fi/filebrowser.po index 3d9de26e5..c1f7083f4 100644 --- a/luci-app-filebrowser/po/fi/filebrowser.po +++ b/luci-app-filebrowser/po/fi/filebrowser.po @@ -1,14 +1,20 @@ msgid "" msgstr "" +"PO-Revision-Date: 2025-04-30 07:56+0000\n" +"Last-Translator: Ricky Tigg \n" +"Language-Team: Finnish \n" "Language: fi\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.12-dev\n" #: applications/luci-app-filebrowser/htdocs/luci-static/resources/view/system/filebrowser.js:16 #: applications/luci-app-filebrowser/root/usr/share/luci/menu.d/luci-app-filebrowser.json:3 msgid "File Browser" -msgstr "" +msgstr "Tiedostoselain" #: applications/luci-app-filebrowser/root/usr/share/rpcd/acl.d/luci-app-filebrowser.json:3 msgid "Grant access to File Browser" -msgstr "" +msgstr "Myönnä pääsy tiedostoselaimeen" diff --git a/luci-app-transmission/po/fi/transmission.po b/luci-app-transmission/po/fi/transmission.po index c84e2cbf9..ffb41326f 100644 --- a/luci-app-transmission/po/fi/transmission.po +++ b/luci-app-transmission/po/fi/transmission.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-11 07:11+0200\n" -"PO-Revision-Date: 2024-01-06 10:09+0000\n" -"Last-Translator: Hannu Nyman \n" +"PO-Revision-Date: 2025-04-30 09:26+0000\n" +"Last-Translator: Ricky Tigg \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.4-dev\n" +"X-Generator: Weblate 5.12-dev\n" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:65 msgid "Alternative download speed" @@ -108,7 +108,7 @@ msgstr "" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:47 msgid "Enabled" -msgstr "Käytössä" +msgstr "Otettu käyttöön" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:136 msgid "Encryption" diff --git a/luci-app-transmission/po/ru/transmission.po b/luci-app-transmission/po/ru/transmission.po index ae7eac82b..f83e1e2f9 100644 --- a/luci-app-transmission/po/ru/transmission.po +++ b/luci-app-transmission/po/ru/transmission.po @@ -2,17 +2,17 @@ msgid "" msgstr "" "Project-Id-Version: LuCI: transmission\n" "POT-Creation-Date: 2012-08-15 17:35+0300\n" -"PO-Revision-Date: 2024-10-30 02:45+0000\n" -"Last-Translator: sergio \n" +"PO-Revision-Date: 2025-04-29 14:59+0000\n" +"Last-Translator: Maksim_220 Кабанов \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " -"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 5.8.2-dev\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Weblate 5.12-dev\n" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" @@ -182,7 +182,7 @@ msgstr "Дополнительно" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:148 msgid "None" -msgstr "Ничего" +msgstr "Нет" #: applications/luci-app-transmission/htdocs/luci-static/resources/view/transmission.js:283 msgid ""