From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZyGvP2T8bz30VM for ; Wed, 14 May 2025 15:08:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZyGvP2LJqz2yVK for ; Wed, 14 May 2025 15:08:49 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZyGvN6m44z2SR for ; Wed, 14 May 2025 15:08:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747235328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=IFJkR1NWy/TqgoF69M74NhwBwP+Id6p4LWkXCzelFRk=; b=4qjNw3isLCBaxvbApuuwk3f5XBkAJwFt/SmHO+AvjvOJtUqBbirUXyPwc00uWR/n/zfEr/ NyE7n1ow3fnmDpAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747235328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=IFJkR1NWy/TqgoF69M74NhwBwP+Id6p4LWkXCzelFRk=; b=WSM8go6sYY9FBtuLJXQu6AYltlmeGzlgibLmRJAK8llghiOWzSH0O5LmUlXRzBQxEgJdUD Jp4GSEwgWUH2QdVtjW1eFPqU7XXAoT/bRpuVEjFkc+1ZXtTnNUIANJpyyylMbapK544vr2 wuqj8XTtskc0vQHbf1OUWj1x2w2etLKdu1L3ZIncua3mJTcnkSus7N6NeyehXA2GJLNEBk njXAv3dQvRgVLp9kBJcIck21Eg84jcbEQr80G8uCrdkzajy2MWtdpFY+ihKRnS4DH4b6Nh 3L/xlmu+x6DEx9pNI3/iNfVGwwuKyOZU7XkgAsduDmLK7KDlkpPH9rCzlrvtkQ== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZyGvN4cxNz2xLH; Wed, 14 May 2025 15:08:48 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5904802e7bc16b201e7887761b3f8a1fc133bb28 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 3568b9f7ca2b3d3ab095541c2027b1a2e16f88cc X-Git-Newrev: 5904802e7bc16b201e7887761b3f8a1fc133bb28 Message-Id: <4ZyGvN4cxNz2xLH@people01.haj.ipfire.org> Date: Wed, 14 May 2025 15:08:48 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5904802e7bc16b201e7887761b3f8a1fc133bb28 (commit) via 0c548547e402abf21acdfd7690e402257e464a1a (commit) via 1f08b0357bdfe150fa7e2139ba7b9094de567562 (commit) via 9c11f9efdaa64e268d19561e7b802549740f32b9 (commit) via 233dbc408a9e92abcd88b90a7d868c412aa71881 (commit) from 3568b9f7ca2b3d3ab095541c2027b1a2e16f88cc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5904802e7bc16b201e7887761b3f8a1fc133bb28 Author: Adolf Belka Date: Wed May 14 15:15:13 2025 +0200 libloc: Addition of patch to deal with gettext update to 0.25 Suggested-by: Michael Tremer Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 0c548547e402abf21acdfd7690e402257e464a1a Author: Adolf Belka Date: Wed May 14 15:15:12 2025 +0200 ddns: Addition of patch to deal with gettext update to 0.25 Suggested-by: Michael Tremer Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 1f08b0357bdfe150fa7e2139ba7b9094de567562 Author: Adolf Belka Date: Wed May 14 15:15:11 2025 +0200 fireperf: Addition of patch to deal with gettext update to 0.25 Suggested-by: Michael Tremer Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 9c11f9efdaa64e268d19561e7b802549740f32b9 Author: Adolf Belka Date: Wed May 14 15:15:10 2025 +0200 gettext: Update to version 0.25 - Update from version 0.24 to 0.25 - Update of rootfile - This is part of a patch set as the gettext update required some patches to other packages to get them to build - Changelog 0.25 # Programming languages support: * Go: - xgettext now supports Go. - 'msgfmt -c' now verifies the syntax of translations of Go format strings. - New examples 'hello-go' and 'hello-go-http' have been added. * TypeScript: - xgettext now supports TypeScript and TSX (= TypeScript with JSX extensions). * D: - A new library libintl_d.a contains the runtime for using GNU gettext message catalogs in the D programming language. - xgettext now supports D. - 'msgfmt -c' now verifies the syntax of translations of D format strings. - A new example 'hello-d' has been added. * Modula-2: - A new library libintl_m2.so contains the runtime for using GNU gettext message catalogs in the Modula-2 programming language. - xgettext now supports Modula-2. - 'msgfmt -c' now verifies the syntax of translations of Modula-2 format strings. - A new example 'hello-modula2' has been added. # Improvements for maintainers: * xgettext has a new option '--generated' that customizes the way the 'POT-Creation-Date' in the POT file is computed. 0.24.1 * Bug fixes: - Fix bad interactions between autoreconf and autopoint. - xgettext: Creating the POT file of a package under Git version control is now faster. Also, the use of Git can be turned off by specifying the option '--no-git'. Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer commit 233dbc408a9e92abcd88b90a7d868c412aa71881 Author: Adolf Belka Date: Wed May 14 14:59:54 2025 +0200 core196: Ship customservices from fwhosts - This was missed in CU193 so the patch from @Luca did not end up getting shipped with Core Update 193. Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/gettext | 302 ++++++++++++++++++++-- config/rootfiles/core/196/filelists/files | 1 + lfs/ddns | 3 +- lfs/fireperf | 9 +- lfs/gettext | 4 +- lfs/libloc | 2 +- src/patches/ddns-014_gettext-0.25_fix.patch | 24 ++ src/patches/fireperf-0.2.0_gettext-0.25_fix.patch | 26 ++ src/patches/libloc-0.9.18_gettext-0.25_fix.patch | 29 +++ 9 files changed, 364 insertions(+), 36 deletions(-) create mode 100644 src/patches/ddns-014_gettext-0.25_fix.patch create mode 100644 src/patches/fireperf-0.2.0_gettext-0.25_fix.patch create mode 100644 src/patches/libloc-0.9.18_gettext-0.25_fix.patch Difference in files: diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext index 7d9401e8d..21a74295e 100644 --- a/config/rootfiles/common/gettext +++ b/config/rootfiles/common/gettext @@ -32,20 +32,20 @@ usr/bin/gettext.sh #usr/lib/libasprintf.so usr/lib/libasprintf.so.0 usr/lib/libasprintf.so.0.0.0 -usr/lib/libgettextlib-0.24.so +usr/lib/libgettextlib-0.25.so #usr/lib/libgettextlib.la #usr/lib/libgettextlib.so #usr/lib/libgettextpo.la #usr/lib/libgettextpo.so usr/lib/libgettextpo.so.0 -usr/lib/libgettextpo.so.0.5.13 -usr/lib/libgettextsrc-0.24.so +usr/lib/libgettextpo.so.0.5.14 +usr/lib/libgettextsrc-0.25.so #usr/lib/libgettextsrc.la usr/lib/libgettextsrc.so #usr/lib/libtextstyle.la #usr/lib/libtextstyle.so usr/lib/libtextstyle.so.0 -usr/lib/libtextstyle.so.0.2.4 +usr/lib/libtextstyle.so.0.2.5 usr/lib/preloadable_libintl.so #usr/libexec/gettext #usr/libexec/gettext/cldr-plurals @@ -53,17 +53,6 @@ usr/lib/preloadable_libintl.so #usr/libexec/gettext/project-id #usr/libexec/gettext/urlget #usr/libexec/gettext/user-email -#usr/share/aclocal/build-to-host.m4 -#usr/share/aclocal/gettext.m4 -#usr/share/aclocal/host-cpu-c-abi.m4 -#usr/share/aclocal/iconv.m4 -#usr/share/aclocal/intlmacosx.m4 -#usr/share/aclocal/lib-ld.m4 -#usr/share/aclocal/lib-link.m4 -#usr/share/aclocal/lib-prefix.m4 -#usr/share/aclocal/nls.m4 -#usr/share/aclocal/po.m4 -#usr/share/aclocal/progtest.m4 #usr/share/doc/gettext #usr/share/doc/gettext/FAQ.html #usr/share/doc/gettext/autopoint.1.html @@ -80,15 +69,21 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples #usr/share/doc/gettext/examples/README #usr/share/doc/gettext/examples/build-aux +#usr/share/doc/gettext/examples/build-aux/csharp.m4 #usr/share/doc/gettext/examples/build-aux/csharpcomp.m4 #usr/share/doc/gettext/examples/build-aux/csharpcomp.sh.in #usr/share/doc/gettext/examples/build-aux/csharpexec-test.exe #usr/share/doc/gettext/examples/build-aux/csharpexec.m4 #usr/share/doc/gettext/examples/build-aux/csharpexec.sh.in +#usr/share/doc/gettext/examples/build-aux/dcomp.m4 +#usr/share/doc/gettext/examples/build-aux/dcomp.sh.in +#usr/share/doc/gettext/examples/build-aux/gocomp.m4 +#usr/share/doc/gettext/examples/build-aux/gocomp.sh.in #usr/share/doc/gettext/examples/build-aux/javacomp.m4 #usr/share/doc/gettext/examples/build-aux/javacomp.sh.in #usr/share/doc/gettext/examples/build-aux/javaexec.m4 #usr/share/doc/gettext/examples/build-aux/javaexec.sh.in +#usr/share/doc/gettext/examples/build-aux/modula2comp.m4 #usr/share/doc/gettext/examples/hello-c #usr/share/doc/gettext/examples/hello-c++ #usr/share/doc/gettext/examples/hello-c++-gnome2 @@ -935,6 +930,62 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-csharp/po/zh_CN.po #usr/share/doc/gettext/examples/hello-csharp/po/zh_HK.po #usr/share/doc/gettext/examples/hello-csharp/po/zh_TW.po +#usr/share/doc/gettext/examples/hello-d +#usr/share/doc/gettext/examples/hello-d/INSTALL +#usr/share/doc/gettext/examples/hello-d/Makefile.am +#usr/share/doc/gettext/examples/hello-d/autoclean.sh +#usr/share/doc/gettext/examples/hello-d/autogen.sh +#usr/share/doc/gettext/examples/hello-d/configure.ac +#usr/share/doc/gettext/examples/hello-d/hello.d.in +#usr/share/doc/gettext/examples/hello-d/m4 +#usr/share/doc/gettext/examples/hello-d/m4/Makefile.am +#usr/share/doc/gettext/examples/hello-d/po +#usr/share/doc/gettext/examples/hello-d/po/LINGUAS +#usr/share/doc/gettext/examples/hello-d/po/Makefile.am +#usr/share/doc/gettext/examples/hello-d/po/af.po +#usr/share/doc/gettext/examples/hello-d/po/ast.po +#usr/share/doc/gettext/examples/hello-d/po/bg.po +#usr/share/doc/gettext/examples/hello-d/po/ca.po +#usr/share/doc/gettext/examples/hello-d/po/cs.po +#usr/share/doc/gettext/examples/hello-d/po/da.po +#usr/share/doc/gettext/examples/hello-d/po/de.po +#usr/share/doc/gettext/examples/hello-d/po/el.po +#usr/share/doc/gettext/examples/hello-d/po/eo.po +#usr/share/doc/gettext/examples/hello-d/po/es.po +#usr/share/doc/gettext/examples/hello-d/po/fi.po +#usr/share/doc/gettext/examples/hello-d/po/fr.po +#usr/share/doc/gettext/examples/hello-d/po/ga.po +#usr/share/doc/gettext/examples/hello-d/po/gl.po +#usr/share/doc/gettext/examples/hello-d/po/hr.po +#usr/share/doc/gettext/examples/hello-d/po/hu.po +#usr/share/doc/gettext/examples/hello-d/po/id.po +#usr/share/doc/gettext/examples/hello-d/po/it.po +#usr/share/doc/gettext/examples/hello-d/po/ja.po +#usr/share/doc/gettext/examples/hello-d/po/ka.po +#usr/share/doc/gettext/examples/hello-d/po/ky.po +#usr/share/doc/gettext/examples/hello-d/po/lv.po +#usr/share/doc/gettext/examples/hello-d/po/ms.po +#usr/share/doc/gettext/examples/hello-d/po/mt.po +#usr/share/doc/gettext/examples/hello-d/po/nb.po +#usr/share/doc/gettext/examples/hello-d/po/nl.po +#usr/share/doc/gettext/examples/hello-d/po/nn.po +#usr/share/doc/gettext/examples/hello-d/po/pl.po +#usr/share/doc/gettext/examples/hello-d/po/pt.po +#usr/share/doc/gettext/examples/hello-d/po/pt_BR.po +#usr/share/doc/gettext/examples/hello-d/po/ro.po +#usr/share/doc/gettext/examples/hello-d/po/ru.po +#usr/share/doc/gettext/examples/hello-d/po/sk.po +#usr/share/doc/gettext/examples/hello-d/po/sl.po +#usr/share/doc/gettext/examples/hello-d/po/sq.po +#usr/share/doc/gettext/examples/hello-d/po/sr.po +#usr/share/doc/gettext/examples/hello-d/po/sv.po +#usr/share/doc/gettext/examples/hello-d/po/ta.po +#usr/share/doc/gettext/examples/hello-d/po/tr.po +#usr/share/doc/gettext/examples/hello-d/po/uk.po +#usr/share/doc/gettext/examples/hello-d/po/vi.po +#usr/share/doc/gettext/examples/hello-d/po/zh_CN.po +#usr/share/doc/gettext/examples/hello-d/po/zh_HK.po +#usr/share/doc/gettext/examples/hello-d/po/zh_TW.po #usr/share/doc/gettext/examples/hello-gawk #usr/share/doc/gettext/examples/hello-gawk/INSTALL #usr/share/doc/gettext/examples/hello-gawk/Makefile.am @@ -991,6 +1042,133 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-gawk/po/zh_CN.po #usr/share/doc/gettext/examples/hello-gawk/po/zh_HK.po #usr/share/doc/gettext/examples/hello-gawk/po/zh_TW.po +#usr/share/doc/gettext/examples/hello-go +#usr/share/doc/gettext/examples/hello-go-http +#usr/share/doc/gettext/examples/hello-go-http/INSTALL +#usr/share/doc/gettext/examples/hello-go-http/Makefile.am +#usr/share/doc/gettext/examples/hello-go-http/autoclean.sh +#usr/share/doc/gettext/examples/hello-go-http/autogen.sh +#usr/share/doc/gettext/examples/hello-go-http/configure.ac +#usr/share/doc/gettext/examples/hello-go-http/example1 +#usr/share/doc/gettext/examples/hello-go-http/example1/Makefile.am +#usr/share/doc/gettext/examples/hello-go-http/example1/go.mod.in +#usr/share/doc/gettext/examples/hello-go-http/example1/hello1ml.go.in +#usr/share/doc/gettext/examples/hello-go-http/m4 +#usr/share/doc/gettext/examples/hello-go-http/m4/Makefile.am +#usr/share/doc/gettext/examples/hello-go-http/po +#usr/share/doc/gettext/examples/hello-go-http/po/LINGUAS +#usr/share/doc/gettext/examples/hello-go-http/po/Makefile.am +#usr/share/doc/gettext/examples/hello-go-http/po/af.po +#usr/share/doc/gettext/examples/hello-go-http/po/ast.po +#usr/share/doc/gettext/examples/hello-go-http/po/bg.po +#usr/share/doc/gettext/examples/hello-go-http/po/ca.po +#usr/share/doc/gettext/examples/hello-go-http/po/cs.po +#usr/share/doc/gettext/examples/hello-go-http/po/da.po +#usr/share/doc/gettext/examples/hello-go-http/po/de.po +#usr/share/doc/gettext/examples/hello-go-http/po/el.po +#usr/share/doc/gettext/examples/hello-go-http/po/eo.po +#usr/share/doc/gettext/examples/hello-go-http/po/es.po +#usr/share/doc/gettext/examples/hello-go-http/po/fi.po +#usr/share/doc/gettext/examples/hello-go-http/po/fr.po +#usr/share/doc/gettext/examples/hello-go-http/po/ga.po +#usr/share/doc/gettext/examples/hello-go-http/po/gl.po +#usr/share/doc/gettext/examples/hello-go-http/po/hr.po +#usr/share/doc/gettext/examples/hello-go-http/po/hu.po +#usr/share/doc/gettext/examples/hello-go-http/po/id.po +#usr/share/doc/gettext/examples/hello-go-http/po/it.po +#usr/share/doc/gettext/examples/hello-go-http/po/ja.po +#usr/share/doc/gettext/examples/hello-go-http/po/ka.po +#usr/share/doc/gettext/examples/hello-go-http/po/ky.po +#usr/share/doc/gettext/examples/hello-go-http/po/lv.po +#usr/share/doc/gettext/examples/hello-go-http/po/ms.po +#usr/share/doc/gettext/examples/hello-go-http/po/mt.po +#usr/share/doc/gettext/examples/hello-go-http/po/nb.po +#usr/share/doc/gettext/examples/hello-go-http/po/nl.po +#usr/share/doc/gettext/examples/hello-go-http/po/nn.po +#usr/share/doc/gettext/examples/hello-go-http/po/pl.po +#usr/share/doc/gettext/examples/hello-go-http/po/pt.po +#usr/share/doc/gettext/examples/hello-go-http/po/pt_BR.po +#usr/share/doc/gettext/examples/hello-go-http/po/ro.po +#usr/share/doc/gettext/examples/hello-go-http/po/ru.po +#usr/share/doc/gettext/examples/hello-go-http/po/sk.po +#usr/share/doc/gettext/examples/hello-go-http/po/sl.po +#usr/share/doc/gettext/examples/hello-go-http/po/sq.po +#usr/share/doc/gettext/examples/hello-go-http/po/sr.po +#usr/share/doc/gettext/examples/hello-go-http/po/sv.po +#usr/share/doc/gettext/examples/hello-go-http/po/ta.po +#usr/share/doc/gettext/examples/hello-go-http/po/tr.po +#usr/share/doc/gettext/examples/hello-go-http/po/uk.po +#usr/share/doc/gettext/examples/hello-go-http/po/vi.po +#usr/share/doc/gettext/examples/hello-go-http/po/zh_CN.po +#usr/share/doc/gettext/examples/hello-go-http/po/zh_HK.po +#usr/share/doc/gettext/examples/hello-go-http/po/zh_TW.po +#usr/share/doc/gettext/examples/hello-go/INSTALL +#usr/share/doc/gettext/examples/hello-go/Makefile.am +#usr/share/doc/gettext/examples/hello-go/autoclean.sh +#usr/share/doc/gettext/examples/hello-go/autogen.sh +#usr/share/doc/gettext/examples/hello-go/configure.ac +#usr/share/doc/gettext/examples/hello-go/example1 +#usr/share/doc/gettext/examples/hello-go/example1/Makefile.am +#usr/share/doc/gettext/examples/hello-go/example1/go.mod.in +#usr/share/doc/gettext/examples/hello-go/example1/hello1ml.go.in +#usr/share/doc/gettext/examples/hello-go/example1/hello1sl.go.in +#usr/share/doc/gettext/examples/hello-go/example2 +#usr/share/doc/gettext/examples/hello-go/example2/Makefile.am +#usr/share/doc/gettext/examples/hello-go/example2/go.mod.in +#usr/share/doc/gettext/examples/hello-go/example2/hello2sl.go.in +#usr/share/doc/gettext/examples/hello-go/example3 +#usr/share/doc/gettext/examples/hello-go/example3/Makefile.am +#usr/share/doc/gettext/examples/hello-go/example3/go.mod.in +#usr/share/doc/gettext/examples/hello-go/example3/hello3ml.go.in +#usr/share/doc/gettext/examples/hello-go/m4 +#usr/share/doc/gettext/examples/hello-go/m4/Makefile.am +#usr/share/doc/gettext/examples/hello-go/po +#usr/share/doc/gettext/examples/hello-go/po/LINGUAS +#usr/share/doc/gettext/examples/hello-go/po/Makefile.am +#usr/share/doc/gettext/examples/hello-go/po/af.po +#usr/share/doc/gettext/examples/hello-go/po/ast.po +#usr/share/doc/gettext/examples/hello-go/po/bg.po +#usr/share/doc/gettext/examples/hello-go/po/ca.po +#usr/share/doc/gettext/examples/hello-go/po/cs.po +#usr/share/doc/gettext/examples/hello-go/po/da.po +#usr/share/doc/gettext/examples/hello-go/po/de.po +#usr/share/doc/gettext/examples/hello-go/po/el.po +#usr/share/doc/gettext/examples/hello-go/po/eo.po +#usr/share/doc/gettext/examples/hello-go/po/es.po +#usr/share/doc/gettext/examples/hello-go/po/fi.po +#usr/share/doc/gettext/examples/hello-go/po/fr.po +#usr/share/doc/gettext/examples/hello-go/po/ga.po +#usr/share/doc/gettext/examples/hello-go/po/gl.po +#usr/share/doc/gettext/examples/hello-go/po/hr.po +#usr/share/doc/gettext/examples/hello-go/po/hu.po +#usr/share/doc/gettext/examples/hello-go/po/id.po +#usr/share/doc/gettext/examples/hello-go/po/it.po +#usr/share/doc/gettext/examples/hello-go/po/ja.po +#usr/share/doc/gettext/examples/hello-go/po/ka.po +#usr/share/doc/gettext/examples/hello-go/po/ky.po +#usr/share/doc/gettext/examples/hello-go/po/lv.po +#usr/share/doc/gettext/examples/hello-go/po/ms.po +#usr/share/doc/gettext/examples/hello-go/po/mt.po +#usr/share/doc/gettext/examples/hello-go/po/nb.po +#usr/share/doc/gettext/examples/hello-go/po/nl.po +#usr/share/doc/gettext/examples/hello-go/po/nn.po +#usr/share/doc/gettext/examples/hello-go/po/pl.po +#usr/share/doc/gettext/examples/hello-go/po/pt.po +#usr/share/doc/gettext/examples/hello-go/po/pt_BR.po +#usr/share/doc/gettext/examples/hello-go/po/ro.po +#usr/share/doc/gettext/examples/hello-go/po/ru.po +#usr/share/doc/gettext/examples/hello-go/po/sk.po +#usr/share/doc/gettext/examples/hello-go/po/sl.po +#usr/share/doc/gettext/examples/hello-go/po/sq.po +#usr/share/doc/gettext/examples/hello-go/po/sr.po +#usr/share/doc/gettext/examples/hello-go/po/sv.po +#usr/share/doc/gettext/examples/hello-go/po/ta.po +#usr/share/doc/gettext/examples/hello-go/po/tr.po +#usr/share/doc/gettext/examples/hello-go/po/uk.po +#usr/share/doc/gettext/examples/hello-go/po/vi.po +#usr/share/doc/gettext/examples/hello-go/po/zh_CN.po +#usr/share/doc/gettext/examples/hello-go/po/zh_HK.po +#usr/share/doc/gettext/examples/hello-go/po/zh_TW.po #usr/share/doc/gettext/examples/hello-guile #usr/share/doc/gettext/examples/hello-guile/INSTALL #usr/share/doc/gettext/examples/hello-guile/Makefile.am @@ -1336,6 +1514,62 @@ usr/lib/preloadable_libintl.so #usr/share/doc/gettext/examples/hello-librep/po/zh_CN.po #usr/share/doc/gettext/examples/hello-librep/po/zh_HK.po #usr/share/doc/gettext/examples/hello-librep/po/zh_TW.po +#usr/share/doc/gettext/examples/hello-modula2 +#usr/share/doc/gettext/examples/hello-modula2/INSTALL +#usr/share/doc/gettext/examples/hello-modula2/Makefile.am +#usr/share/doc/gettext/examples/hello-modula2/autoclean.sh +#usr/share/doc/gettext/examples/hello-modula2/autogen.sh +#usr/share/doc/gettext/examples/hello-modula2/configure.ac +#usr/share/doc/gettext/examples/hello-modula2/hello.mod.in +#usr/share/doc/gettext/examples/hello-modula2/m4 +#usr/share/doc/gettext/examples/hello-modula2/m4/Makefile.am +#usr/share/doc/gettext/examples/hello-modula2/po +#usr/share/doc/gettext/examples/hello-modula2/po/LINGUAS +#usr/share/doc/gettext/examples/hello-modula2/po/Makefile.am +#usr/share/doc/gettext/examples/hello-modula2/po/af.po +#usr/share/doc/gettext/examples/hello-modula2/po/ast.po +#usr/share/doc/gettext/examples/hello-modula2/po/bg.po +#usr/share/doc/gettext/examples/hello-modula2/po/ca.po +#usr/share/doc/gettext/examples/hello-modula2/po/cs.po +#usr/share/doc/gettext/examples/hello-modula2/po/da.po +#usr/share/doc/gettext/examples/hello-modula2/po/de.po +#usr/share/doc/gettext/examples/hello-modula2/po/el.po +#usr/share/doc/gettext/examples/hello-modula2/po/eo.po +#usr/share/doc/gettext/examples/hello-modula2/po/es.po +#usr/share/doc/gettext/examples/hello-modula2/po/fi.po +#usr/share/doc/gettext/examples/hello-modula2/po/fr.po +#usr/share/doc/gettext/examples/hello-modula2/po/ga.po +#usr/share/doc/gettext/examples/hello-modula2/po/gl.po +#usr/share/doc/gettext/examples/hello-modula2/po/hr.po +#usr/share/doc/gettext/examples/hello-modula2/po/hu.po +#usr/share/doc/gettext/examples/hello-modula2/po/id.po +#usr/share/doc/gettext/examples/hello-modula2/po/it.po +#usr/share/doc/gettext/examples/hello-modula2/po/ja.po +#usr/share/doc/gettext/examples/hello-modula2/po/ka.po +#usr/share/doc/gettext/examples/hello-modula2/po/ky.po +#usr/share/doc/gettext/examples/hello-modula2/po/lv.po +#usr/share/doc/gettext/examples/hello-modula2/po/ms.po +#usr/share/doc/gettext/examples/hello-modula2/po/mt.po +#usr/share/doc/gettext/examples/hello-modula2/po/nb.po +#usr/share/doc/gettext/examples/hello-modula2/po/nl.po +#usr/share/doc/gettext/examples/hello-modula2/po/nn.po +#usr/share/doc/gettext/examples/hello-modula2/po/pl.po +#usr/share/doc/gettext/examples/hello-modula2/po/pt.po +#usr/share/doc/gettext/examples/hello-modula2/po/pt_BR.po +#usr/share/doc/gettext/examples/hello-modula2/po/ro.po +#usr/share/doc/gettext/examples/hello-modula2/po/ru.po +#usr/share/doc/gettext/examples/hello-modula2/po/sk.po +#usr/share/doc/gettext/examples/hello-modula2/po/sl.po +#usr/share/doc/gettext/examples/hello-modula2/po/sq.po +#usr/share/doc/gettext/examples/hello-modula2/po/sr.po +#usr/share/doc/gettext/examples/hello-modula2/po/sv.po +#usr/share/doc/gettext/examples/hello-modula2/po/ta.po +#usr/share/doc/gettext/examples/hello-modula2/po/tr.po +#usr/share/doc/gettext/examples/hello-modula2/po/uk.po +#usr/share/doc/gettext/examples/hello-modula2/po/vi.po +#usr/share/doc/gettext/examples/hello-modula2/po/zh_CN.po +#usr/share/doc/gettext/examples/hello-modula2/po/zh_HK.po +#usr/share/doc/gettext/examples/hello-modula2/po/zh_TW.po #usr/share/doc/gettext/examples/hello-objc #usr/share/doc/gettext/examples/hello-objc-gnome2 #usr/share/doc/gettext/examples/hello-objc-gnome2/INSTALL @@ -2219,25 +2453,37 @@ usr/lib/preloadable_libintl.so #usr/share/doc/libtextstyle/libtextstyle_abt.html #usr/share/doc/libtextstyle/libtextstyle_toc.html #usr/share/gettext -#usr/share/gettext-0.24 -#usr/share/gettext-0.24/its -#usr/share/gettext-0.24/its/docbook.loc -#usr/share/gettext-0.24/its/docbook4.its -#usr/share/gettext-0.24/its/docbook5.its -#usr/share/gettext-0.24/its/glade.loc -#usr/share/gettext-0.24/its/glade1.its -#usr/share/gettext-0.24/its/glade2.its -#usr/share/gettext-0.24/its/gsettings.its -#usr/share/gettext-0.24/its/gsettings.loc -#usr/share/gettext-0.24/its/gtkbuilder.its -#usr/share/gettext-0.24/its/metainfo.its -#usr/share/gettext-0.24/its/metainfo.loc +#usr/share/gettext-0.25 +#usr/share/gettext-0.25/its +#usr/share/gettext-0.25/its/docbook.loc +#usr/share/gettext-0.25/its/docbook4.its +#usr/share/gettext-0.25/its/docbook5.its +#usr/share/gettext-0.25/its/glade.loc +#usr/share/gettext-0.25/its/glade1.its +#usr/share/gettext-0.25/its/glade2.its +#usr/share/gettext-0.25/its/gsettings.its +#usr/share/gettext-0.25/its/gsettings.loc +#usr/share/gettext-0.25/its/gtkbuilder.its +#usr/share/gettext-0.25/its/metainfo.its +#usr/share/gettext-0.25/its/metainfo.loc #usr/share/gettext/ABOUT-NLS #usr/share/gettext/archive.dir.tar.xz #usr/share/gettext/config.rpath #usr/share/gettext/disclaim-translations.txt #usr/share/gettext/gettext.h #usr/share/gettext/javaversion.class +#usr/share/gettext/m4 +#usr/share/gettext/m4/build-to-host.m4 +#usr/share/gettext/m4/gettext.m4 +#usr/share/gettext/m4/host-cpu-c-abi.m4 +#usr/share/gettext/m4/iconv.m4 +#usr/share/gettext/m4/intlmacosx.m4 +#usr/share/gettext/m4/lib-ld.m4 +#usr/share/gettext/m4/lib-link.m4 +#usr/share/gettext/m4/lib-prefix.m4 +#usr/share/gettext/m4/nls.m4 +#usr/share/gettext/m4/po.m4 +#usr/share/gettext/m4/progtest.m4 #usr/share/gettext/msgunfmt.tcl #usr/share/gettext/po #usr/share/gettext/po/Makefile.in.in diff --git a/config/rootfiles/core/196/filelists/files b/config/rootfiles/core/196/filelists/files index 1be17a342..db33fd261 100644 --- a/config/rootfiles/core/196/filelists/files +++ b/config/rootfiles/core/196/filelists/files @@ -1,3 +1,4 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pakfire.cgi var/ipfire/langs/list +var/ipfire/fwhosts/customservices diff --git a/lfs/ddns b/lfs/ddns index 274c12cb9..470157db0 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Apply upstream patches. cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-014-freednsafraid-fix-typo.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-system-Catch-exception-when-host-is-not-dual-stacked.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ddns-014_gettext-0.25_fix.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/lfs/fireperf b/lfs/fireperf index 1cdd32635..497bba538 100644 --- a/lfs/fireperf +++ b/lfs/fireperf @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fireperf -PAK_VER = 2 +PAK_VER = 3 DEPS = @@ -81,10 +81,11 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-man-pages + --prefix=/usr \ + --disable-man-pages cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/gettext b/lfs/gettext index de1d18c16..fcca1901b 100644 --- a/lfs/gettext +++ b/lfs/gettext @@ -24,7 +24,7 @@ include Config -VER = 0.24 +VER = 0.25 THISAPP = gettext-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -56,7 +56,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = a171c9a62552d8cbb632f76c734c7b8ef0b99ae56a2b12548bfc61fe671ad4c39611b4e66fe89e51a1d1d31f1052fb6a1d33930820fd0fa8d9fb83bd38504e50 +$(DL_FILE)_BLAKE2 = cec5dd43f64ea676b112d53374452852ad25b2d31833a805bb2f92cd0b172536b47f916ad630fd4acd11208d408ff302eac2a5cd6a78ec653b7d5a3b447f5584 install : $(TARGET) diff --git a/lfs/libloc b/lfs/libloc index 8e438b50d..f2f0aa8a9 100644 --- a/lfs/libloc +++ b/lfs/libloc @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # https://lists.ipfire.org/pipermail/development/2022-November/014763.html cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18-Revert-Install-Perl-files-to-Perl-vendor-directory.patch - + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18_gettext-0.25_fix.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/src/patches/ddns-014_gettext-0.25_fix.patch b/src/patches/ddns-014_gettext-0.25_fix.patch new file mode 100644 index 000000000..e12f8fd28 --- /dev/null +++ b/src/patches/ddns-014_gettext-0.25_fix.patch @@ -0,0 +1,24 @@ +diff -Naur ddns-014.orig/autogen.sh ddns-014/autogen.sh +--- ddns-014.orig/autogen.sh 2021-07-12 17:29:29.000000000 +0200 ++++ ddns-014/autogen.sh 2025-05-14 10:51:56.418304212 +0200 +@@ -1,4 +1,5 @@ + #!/bin/sh + ++autopoint + intltoolize --force --automake + autoreconf --force --install --symlink +diff -Naur ddns-014.orig/configure.ac ddns-014/configure.ac +--- ddns-014.orig/configure.ac 2021-07-12 17:29:29.000000000 +0200 ++++ ddns-014/configure.ac 2025-05-14 10:50:38.840855781 +0200 +@@ -42,7 +42,10 @@ + ]) + AM_SILENT_RULES([yes]) + +-IT_PROG_INTLTOOL([0.40.0]) ++AM_GNU_GETTEXT_VERSION(0.25) ++AM_GNU_GETTEXT([external]) ++ ++IT_PROG_INTLTOOL([0.51.0]) + + GETTEXT_PACKAGE=ddns + AC_SUBST(GETTEXT_PACKAGE) diff --git a/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch b/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch new file mode 100644 index 000000000..8bd152e79 --- /dev/null +++ b/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch @@ -0,0 +1,26 @@ +diff -Naur fireperf-0.2.0.orig/autogen.sh fireperf-0.2.0/autogen.sh +--- fireperf-0.2.0.orig/autogen.sh 2021-02-23 16:06:33.000000000 +0100 ++++ fireperf-0.2.0/autogen.sh 2025-05-14 10:03:40.623918720 +0200 +@@ -8,8 +8,9 @@ + echo "Activated pre-commit hook." + fi + ++autopoint + intltoolize --force --automake +-autoreconf --install --symlink ++autoreconf --install --symlink --force + + libdir() { + echo $(cd $1/$(gcc -print-multi-os-directory); pwd) +diff -Naur fireperf-0.2.0.orig/configure.ac fireperf-0.2.0/configure.ac +--- fireperf-0.2.0.orig/configure.ac 2021-02-23 16:06:33.000000000 +0100 ++++ fireperf-0.2.0/configure.ac 2025-05-13 20:47:20.578717837 +0200 +@@ -28,6 +28,8 @@ + pic-only + ]) + AC_PREFIX_DEFAULT([/usr]) ++AM_GNU_GETTEXT_VERSION(0.25) ++AM_GNU_GETTEXT([external]) + + IT_PROG_INTLTOOL([0.40.0]) + diff --git a/src/patches/libloc-0.9.18_gettext-0.25_fix.patch b/src/patches/libloc-0.9.18_gettext-0.25_fix.patch new file mode 100644 index 000000000..ad8d3c92a --- /dev/null +++ b/src/patches/libloc-0.9.18_gettext-0.25_fix.patch @@ -0,0 +1,29 @@ +diff -Naur libloc-0.9.18.orig/autogen.sh libloc-0.9.18/autogen.sh +--- libloc-0.9.18.orig/autogen.sh 2025-03-10 12:07:35.000000000 +0100 ++++ libloc-0.9.18/autogen.sh 2025-05-14 11:24:52.602116647 +0200 +@@ -8,8 +8,9 @@ + echo "Activated pre-commit hook." + fi + ++autopoint + intltoolize --force --automake +-autoreconf --install --symlink ++autoreconf --force --install --symlink + + libdir() { + echo $(cd $1/$(gcc -print-multi-os-directory); pwd) +diff -Naur libloc-0.9.18.orig/configure.ac libloc-0.9.18/configure.ac +--- libloc-0.9.18.orig/configure.ac 2025-03-10 12:07:35.000000000 +0100 ++++ libloc-0.9.18/configure.ac 2025-05-14 11:25:45.712783931 +0200 +@@ -30,7 +30,10 @@ + AC_PREFIX_DEFAULT([/usr]) + gl_LD_VERSION_SCRIPT + +-IT_PROG_INTLTOOL([0.40.0]) +++AM_GNU_GETTEXT_VERSION(0.25) +++AM_GNU_GETTEXT([external]) ++ ++IT_PROG_INTLTOOL([0.51.0]) + + # Interpret embedded Python in HTML files + XGETTEXT="${XGETTEXT} -L Python --keyword=_:1,2 --keyword=N_:1,2 --no-location" hooks/post-receive -- IPFire 2.x development tree