- Update from version 1.16.0 to 1.17.6 - Update of rootfile - Next version will only build with meson and as there were some bugs with the autoconf tools build which required a hack to overcome, this version was changed to run with meson. beos and os2 backends are no longer supported and windows only builds if the platform being used for the build is windows based. Therefore those options are no longer needed. meson uses shared libraries only by default. - The cairo-1.16.0-binutils-2.34 patch is no longer needed as the changes have been included in the source tarball. - tarball had to be changed to .bz2 as xz is no longer provided. - Changelog Release 1.17.6 (2022-03-18 Emmanuele Bassi ebassi@gnome.org) I spy with my little eye… a Cairo snapshot! First of all, many, many thanks to everyone who contributed to Cairo during this development cycle. A special thank you goes to: - Adrian Johnson - Uli Schlachter for their tireless efforts in ensuring that the lights are still on in the Cairo project. This snapshot sees the removal of the following backends and platform support: - Qt4 - BeOS - OS/2 - DirectFB - DRM - Cogl - OpenVG Thanks to all past contributors for their work on them. If you were using any of these backends then you will need to stick to Cairo 1.16. To offset the removal of the backends above, Adrian Johnson landed the DWrite font rendering backend on Windows. There have been multiple improvements in the Quartz backend, courtesy of John Ralls. Tim-Philipp Müller has kept the Meson build in top shape. This snapshot is going to be the **last** release of Cairo with the Autotools build system. The Meson build has seen many improvements and it is considerably easier to maintain and faster to build. Release 1.17.4 (2020-11-27 Bryce Harrington bryce@bryceharrington.org) Thank you to the many people who have contributed the large number of bug fixes and refinements since 1.17.2. A particularly noteworthy improvement in this release is the addition of the meson build system as an alternative to autotools. Autotools is still used for producing the releases, so will be the default in the tarball and presumably will still be preferred by distro packagers of Cairo. It should be possible to build the release tarball using meson, but as this is new functionality consider it still a work in progress. The meson configuration has striven to track the autotools implementation but be aware there may still be some differences between the two. Continuous Integration configurations have been added that enable testing on a variety of platforms including Fedora, Windows MSVC, etc. This work has helped in identifying updates and fixes including adjusting to changes in API calls in dependencies like rsvg and fontconfig, and to fix platform-specific build issues. The cogl Cairo backend underwent significant development this cycle. Cogl provides GPU accelerated drawing support. The development work includes implementation of core functionality, performance optimizations, and stabilization. Subpixel positioning support allows improved glyph outlines with the Freetype font backend. For a complete log of changes, please see https://cairographics.org/releases/ChangeLog.1.17.4 [On a personal note, this will be my last release for Cairo. My Cairo time availability has been non-existent (particularly this crazy past year). The release process is well documented and hopefully will help whomever picks up the baton from here.] Release 1.17.2 (2019-01-31 Bryce Harrington bryce@bryceharrington.org) This snapshot provides the new support for writing floating point formats as 16 bpc PNGs, with support for RGBA128F and RGB96F formats. This new feature increases Cairo's pixman version requirement to 0.36.0. Beyond this are a range of bugfixes and some work on establishing CI for Cairo. For a complete log of changes, please see https://cairographics.org/releases/ChangeLog.1.17.2 API Changes None Dependency Changes pixman 0.36.0
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/cairo | 78 +------------------- lfs/cairo | 18 ++--- src/patches/cairo-1.16.0-binutils-2.34.patch | 20 ----- 3 files changed, 13 insertions(+), 103 deletions(-) delete mode 100644 src/patches/cairo-1.16.0-binutils-2.34.patch
diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo index 7cbb434d1..c83ed107c 100644 --- a/config/rootfiles/common/cairo +++ b/config/rootfiles/common/cairo @@ -12,97 +12,27 @@ #usr/include/cairo/cairo-version.h #usr/include/cairo/cairo.h #usr/lib/cairo -#usr/lib/cairo/libcairo-trace.a #usr/lib/cairo/libcairo-trace.la #usr/lib/cairo/libcairo-trace.so -#usr/lib/libcairo-gobject.a #usr/lib/libcairo-gobject.la #usr/lib/libcairo-gobject.so usr/lib/libcairo-gobject.so.2 -usr/lib/libcairo-gobject.so.2.11600.0 -#usr/lib/libcairo-script-interpreter.a +usr/lib/libcairo-gobject.so.2.11706.0 #usr/lib/libcairo-script-interpreter.la #usr/lib/libcairo-script-interpreter.so usr/lib/libcairo-script-interpreter.so.2 -usr/lib/libcairo-script-interpreter.so.2.11600.0 -#usr/lib/libcairo.a +usr/lib/libcairo-script-interpreter.so.2.11706.0 #usr/lib/libcairo.la #usr/lib/libcairo.so usr/lib/libcairo.so.2 -usr/lib/libcairo.so.2.11600.0 +usr/lib/libcairo.so.2.11706.0 #usr/lib/pkgconfig/cairo-fc.pc #usr/lib/pkgconfig/cairo-ft.pc #usr/lib/pkgconfig/cairo-gobject.pc #usr/lib/pkgconfig/cairo-pdf.pc #usr/lib/pkgconfig/cairo-png.pc #usr/lib/pkgconfig/cairo-ps.pc +#usr/lib/pkgconfig/cairo-script-interpreter.pc #usr/lib/pkgconfig/cairo-script.pc #usr/lib/pkgconfig/cairo-svg.pc #usr/lib/pkgconfig/cairo.pc -#usr/share/gtk-doc/html/cairo -#usr/share/gtk-doc/html/cairo/bindings-errors.html -#usr/share/gtk-doc/html/cairo/bindings-fonts.html -#usr/share/gtk-doc/html/cairo/bindings-memory.html -#usr/share/gtk-doc/html/cairo/bindings-overloading.html -#usr/share/gtk-doc/html/cairo/bindings-path.html -#usr/share/gtk-doc/html/cairo/bindings-patterns.html -#usr/share/gtk-doc/html/cairo/bindings-return-values.html -#usr/share/gtk-doc/html/cairo/bindings-streams.html -#usr/share/gtk-doc/html/cairo/bindings-surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-Error-handling.html -#usr/share/gtk-doc/html/cairo/cairo-FreeType-Fonts.html -#usr/share/gtk-doc/html/cairo/cairo-Image-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-PDF-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-PNG-Support.html -#usr/share/gtk-doc/html/cairo/cairo-Paths.html -#usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html -#usr/share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-Raster-Sources.html -#usr/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-Regions.html -#usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-Tags-and-Links.html -#usr/share/gtk-doc/html/cairo/cairo-Transformations.html -#usr/share/gtk-doc/html/cairo/cairo-Types.html -#usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html -#usr/share/gtk-doc/html/cairo/cairo-Version-Information.html -#usr/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html -#usr/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-matrix-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-pattern-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-scaled-font-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-surface-t.html -#usr/share/gtk-doc/html/cairo/cairo-cairo-t.html -#usr/share/gtk-doc/html/cairo/cairo-drawing.html -#usr/share/gtk-doc/html/cairo/cairo-fonts.html -#usr/share/gtk-doc/html/cairo/cairo-support.html -#usr/share/gtk-doc/html/cairo/cairo-surfaces.html -#usr/share/gtk-doc/html/cairo/cairo-text.html -#usr/share/gtk-doc/html/cairo/cairo.devhelp2 -#usr/share/gtk-doc/html/cairo/home.png -#usr/share/gtk-doc/html/cairo/index-1.10.html -#usr/share/gtk-doc/html/cairo/index-1.12.html -#usr/share/gtk-doc/html/cairo/index-1.14.html -#usr/share/gtk-doc/html/cairo/index-1.16.html -#usr/share/gtk-doc/html/cairo/index-1.2.html -#usr/share/gtk-doc/html/cairo/index-1.4.html -#usr/share/gtk-doc/html/cairo/index-1.6.html -#usr/share/gtk-doc/html/cairo/index-1.8.html -#usr/share/gtk-doc/html/cairo/index-all.html -#usr/share/gtk-doc/html/cairo/index.html -#usr/share/gtk-doc/html/cairo/language-bindings.html -#usr/share/gtk-doc/html/cairo/left-insensitive.png -#usr/share/gtk-doc/html/cairo/left.png -#usr/share/gtk-doc/html/cairo/right-insensitive.png -#usr/share/gtk-doc/html/cairo/right.png -#usr/share/gtk-doc/html/cairo/style.css -#usr/share/gtk-doc/html/cairo/up-insensitive.png -#usr/share/gtk-doc/html/cairo/up.png diff --git a/lfs/cairo b/lfs/cairo index 191f4560d..30744b3d7 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 # @@ -24,10 +24,10 @@
include Config
-VER = 1.16.0 +VER = 1.17.6
THISAPP = cairo-$(VER) -DL_FILE = $(THISAPP).tar.xz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0 +$(DL_FILE)_BLAKE2 = 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724
install : $(TARGET)
@@ -70,10 +70,10 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cairo-1.16.0-binutils-2.34.patch - cd $(DIR_APP) && ./configure --prefix=/usr \ - --disable-win32 --disable-os2 --disable-beos - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson \ + --prefix=/usr \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/cairo-1.16.0-binutils-2.34.patch b/src/patches/cairo-1.16.0-binutils-2.34.patch deleted file mode 100644 index 03daac0ec..000000000 --- a/src/patches/cairo-1.16.0-binutils-2.34.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/util/cairo-trace/lookup-symbol.c -+++ b/util/cairo-trace/lookup-symbol.c -@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd, - if (symbol->found) - return; - -- if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0) -+ if ((bfd_section_flags (section) & SEC_ALLOC) == 0) - return; - -- vma = bfd_get_section_vma (symtab->bfd, section); -+ vma = bfd_section_vma (section); - if (symbol->pc < vma) - return; - -- size = bfd_section_size (symtab->bfd, section); -+ size = bfd_section_size (section); - if (symbol->pc >= vma + size) - return; -
- Update from version 1.9.3 to 1.9.4 - Update of rootfile - Changelog v1.9.4 perf : faster decoding speed (~+20%) on aarch64 platforms perf : faster decoding speed (~+70%) for -BD4 setting in CLI api : new function `LZ4_decompress_safe_partial_usingDict()` by @yawqi api : lz4frame: ability to provide custom allocators at state creation api : can skip checksum validation for improved decoding speed api : new experimental unit `lz4file` for file i/o API, by @anjiahao1 api : new experimental function `LZ4F_uncompressedUpdate()`, by @alexmohr cli : `--list` works on `stdin` input, by @Low-power cli : `--no-crc` does not produce (compression) nor check (decompression) checksums cli : fix: `--test` and `--list` produce an error code when parsing invalid input cli : fix: support skippable frames when passed via `stdin`, reported by @davidmankin build: fix: Makefile respects CFLAGS directives passed via environment variable build: `LZ4_FREESTANDING`, new build macro for freestanding environments, by @t-mat build: `make` and `make test` are compatible with `-j` parallel run build: AS/400 compatibility, by @jonrumsey build: Solaris 10 compatibility, by @pekdon build: MSVC 2022 support, by @t-mat build: improved meson script, by @eli-schwartz doc : Updated LZ4 block format, provide an "implementation notes" section
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/lz4 | 2 +- lfs/lz4 | 8 ++++---- ...th.patch => lz4-1.9.4_mod_install_path.patch} | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) rename src/patches/{lz4-1.9.3_mod_install_path.patch => lz4-1.9.4_mod_install_path.patch} (60%)
diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4 index 9a8abcd2b..4864814ec 100644 --- a/config/rootfiles/common/lz4 +++ b/config/rootfiles/common/lz4 @@ -9,7 +9,7 @@ usr/bin/lz4 #usr/lib/liblz4.a #usr/lib/liblz4.so usr/lib/liblz4.so.1 -usr/lib/liblz4.so.1.9.3 +usr/lib/liblz4.so.1.9.4 #usr/lib/pkgconfig/liblz4.pc #usr/share/man/man1/lz4.1 #usr/share/man/man1/lz4c.1 diff --git a/lfs/lz4 b/lfs/lz4 index 7f3f87144..f15b962c9 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 1.9.3 +VER = 1.9.4
THISAPP = lz4-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 +$(DL_FILE)_BLAKE2 = 2289cdce36acd35283bf2f02ef4d6d8f4805563be6d5a3492f3d6ea7975fb6bd14e1ac2e505df9747776edf8bcf0da7ba4ae7084b150e3ec08a52a9885f92ad5
install : $(TARGET)
@@ -74,7 +74,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.3_mod_install_path.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.4_mod_install_path.patch
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/src/patches/lz4-1.9.3_mod_install_path.patch b/src/patches/lz4-1.9.4_mod_install_path.patch similarity index 60% rename from src/patches/lz4-1.9.3_mod_install_path.patch rename to src/patches/lz4-1.9.4_mod_install_path.patch index 3b674c4d8..5bd227259 100644 --- a/src/patches/lz4-1.9.3_mod_install_path.patch +++ b/src/patches/lz4-1.9.4_mod_install_path.patch @@ -1,7 +1,7 @@ -diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile ---- lz4-1.9.3/lib/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 -+++ lz4-1.9.3/lib/Makefile 2021-02-08 13:05:10.478443593 +0100 -@@ -144,7 +144,7 @@ +diff -Naur lz4-1.9.4.orig/lib/Makefile lz4-1.9.4/lib/Makefile +--- lz4-1.9.4.orig/lib/Makefile 2022-08-16 00:45:31.000000000 +0200 ++++ lz4-1.9.4/lib/Makefile 2023-01-25 14:31:42.117296250 +0100 +@@ -151,7 +151,7 @@ # directory variables : GNU conventions prefer lowercase # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html # support both lower and uppercase (BSD), use lower in script @@ -10,10 +10,10 @@ diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile prefix ?= $(PREFIX) EXEC_PREFIX ?= $(prefix) exec_prefix ?= $(EXEC_PREFIX) -diff -au lz4-1.9.3/programs/Makefile.orig lz4-1.9.3/programs/Makefile ---- lz4-1.9.3/programs/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 -+++ lz4-1.9.3/programs/Makefile 2021-02-08 13:05:55.475676260 +0100 -@@ -146,7 +146,7 @@ +diff -Naur lz4-1.9.4.orig/programs/Makefile lz4-1.9.4/programs/Makefile +--- lz4-1.9.4.orig/programs/Makefile 2022-08-16 00:45:31.000000000 +0200 ++++ lz4-1.9.4/programs/Makefile 2023-01-25 14:31:56.923590369 +0100 +@@ -157,7 +157,7 @@ # directory variables : GNU conventions prefer lowercase # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html # support both lower and uppercase (BSD), use lowercase in script
- Update from version 2.6.1 to 2.6.2 - Update of rootfile - Changelog is available in sourceforge at the following url https://sourceforge.net/projects/nfs/files/nfs-utils/2.6.2/
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/packages/nfs | 7 +++++++ lfs/nfs | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs index e05c12d12..ff53abec9 100644 --- a/config/rootfiles/packages/nfs +++ b/config/rootfiles/packages/nfs @@ -24,7 +24,11 @@ usr/lib/libnfsidmap/static.so #usr/lib/libnfsidmap/umich_ldap.a #usr/lib/libnfsidmap/umich_ldap.la usr/lib/libnfsidmap/umich_ldap.so +#usr/lib/modprobe.d +#usr/lib/modprobe.d/50-nfs.conf #usr/lib/pkgconfig/libnfsidmap.pc +#usr/lib/udev/rules.d/99-nfs.rules +#usr/libexec/nfsrahead #usr/sbin/blkmapd usr/sbin/exportfs usr/sbin/mountstats @@ -39,6 +43,7 @@ usr/sbin/rpc.idmapd usr/sbin/rpc.mountd usr/sbin/rpc.nfsd usr/sbin/rpc.statd +usr/sbin/rpcctl usr/sbin/rpcdebug usr/sbin/showmount usr/sbin/sm-notify @@ -49,6 +54,7 @@ usr/sbin/start-statd #usr/share/man/man5/nfs.5 #usr/share/man/man5/nfs.conf.5 #usr/share/man/man5/nfsmount.conf.5 +#usr/share/man/man5/nfsrahead.5 #usr/share/man/man7/nfs.systemd.7 #usr/share/man/man7/nfsd.7 #usr/share/man/man8/blkmapd.8 @@ -71,6 +77,7 @@ usr/sbin/start-statd #usr/share/man/man8/rpc.nfsd.8 #usr/share/man/man8/rpc.sm-notify.8 #usr/share/man/man8/rpc.statd.8 +#usr/share/man/man8/rpcctl.8 #usr/share/man/man8/rpcdebug.8 #usr/share/man/man8/showmount.8 #usr/share/man/man8/sm-notify.8 diff --git a/lfs/nfs b/lfs/nfs index a29ea498c..877b9985e 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 # @@ -26,15 +26,15 @@ include Config
SUMMARY = Support Utilities for Kernel nfsd
-VER = 2.6.1 +VER = 2.6.2
THISAPP = nfs-utils-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs -PAK_VER = 18 +PAK_VER = 19
DEPS = rpcbind
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = fe6ec58b4c0def75a43f40a581a9d67d25ee2e6979f41da87453661b33460b99744e1799d6b1a3ef026027cafb1aae8a954cc6449d3eb77eee494fe72804751d +$(DL_FILE)_BLAKE2 = ac5aeec051f10e7cd9593d21ecd07eddc87fd6d98e5aaa0db5c6af5ec223c05d856a877469a340c68364bbb317ec2ee3cfe79b7f9ff444028c8f851838f59853
install : $(TARGET)
- Update from version 6.1.0 to 6.1.1 - Update of rootfile not required - Changelog There is no changelog in the source tarball or in the kernel site where the source tarballs are available from. xfs.org, which normally provides access to the git repository, fails to connect. xfs.wiki.kernel.org has no changelog info in it.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/xfsprogs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lfs/xfsprogs b/lfs/xfsprogs index 92784a619..5dfb1542e 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -24,7 +24,7 @@
include Config
-VER = 6.1.0 +VER = 6.1.1
THISAPP = xfsprogs-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 0be85ec90079bb4cb5888785f872365382dc2bdeb9f64780dfd3dd2c8ec5fdea7eda76f5fe683de7f768d5d4b822e85a59e80ed713f196647f5c4431601fab7b +$(DL_FILE)_BLAKE2 = f6551356ccc68ee6d0bdc50edcf9717bfc94053e97b408f0fa6b316d51391bd347baa8c6ce09e269d09177eec14befc4235738e92d5e4408bda1113c79b2b18b
install : $(TARGET)
- Update from version 5.4.0 to 5.4.1 - Update of rootfile - Changelog 5.4.1 (2023-01-11) * liblzma: - Fixed the return value of lzma_microlzma_encoder() if the LZMA options lc/lp/pb are invalid. Invalid lc/lp/pb options made the function return LZMA_STREAM_END without encoding anything instead of returning LZMA_OPTIONS_ERROR. - Windows / Visual Studio: Workaround a possible compiler bug when targeting 32-bit x86 and compiling the CLMUL version of the CRC64 code. The CLMUL code isn't enabled by the Windows project files but it is in the CMake-based builds. * Build systems: - Windows-specific CMake changes: * Don't try to enable CLMUL CRC64 code if _mm_set_epi64x() isn't available. This fixes CMake-based build with Visual Studio 2013. * Created a workaround for a build failure with windres from GNU binutils. It is used only when the C compiler is GCC (not Clang). The workaround is incompatible with llvm-windres, resulting in "XZx20Utils" instead of "XZ Utils" in the resource file, but without the workaround llvm-windres works correctly. See the comment in CMakeLists.txt for details. * Included the resource files in the xz and xzdec build rules. Building the command line tools is still experimental but possible with MinGW-w64. - Visual Studio: Added stream_decoder_mt.c to the project files. Now the threaded decompressor lzma_stream_decoder_mt() gets built. CMake-based build wasn't affected. - Updated windows/INSTALL-MSVC.txt to mention that CMake-based build is now the preferred method with Visual Studio. The project files will probably be removed after 5.4.x releases. - Changes to #defines in config.h: * HAVE_DECL_CLOCK_MONOTONIC was replaced by HAVE_CLOCK_MONOTONIC. The old macro was always defined in configure-generated config.h to either 0 or 1. The new macro is defined (to 1) only if the declaration of CLOCK_MONOTONIC is available. This matches the way most other config.h macros work and makes things simpler with other build systems. * HAVE_DECL_PROGRAM_INVOCATION_NAME was replaced by HAVE_PROGRAM_INVOCATION_NAME for the same reason. * Tests: - Fixed test script compatibility with ancient /bin/sh versions. Now the five test_compress_* tests should no longer fail on Solaris 10. - Added and refactored a few tests. * Translations: - Updated the Catalan and Esperanto translations. - Added Korean and Ukrainian man page translations.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/xz | 52 ++++++++++++++++++++++++++++++++++++-- lfs/xz | 6 ++--- 2 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index 1e4a43729..69d440435 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -39,9 +39,9 @@ usr/bin/xzmore #usr/include/lzma/vli.h #usr/lib/liblzma.a #usr/lib/liblzma.la -usr/lib/liblzma.so +#usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.4.0 +usr/lib/liblzma.so.5.4.1 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS @@ -130,6 +130,30 @@ usr/lib/liblzma.so.5.4.0 #usr/share/man/fr/man1/xzdiff.1 #usr/share/man/fr/man1/xzless.1 #usr/share/man/fr/man1/xzmore.1 +#usr/share/man/ko +#usr/share/man/ko/man1 +#usr/share/man/ko/man1/lzcat.1 +#usr/share/man/ko/man1/lzcmp.1 +#usr/share/man/ko/man1/lzdiff.1 +#usr/share/man/ko/man1/lzegrep.1 +#usr/share/man/ko/man1/lzfgrep.1 +#usr/share/man/ko/man1/lzgrep.1 +#usr/share/man/ko/man1/lzless.1 +#usr/share/man/ko/man1/lzma.1 +#usr/share/man/ko/man1/lzmadec.1 +#usr/share/man/ko/man1/lzmore.1 +#usr/share/man/ko/man1/unlzma.1 +#usr/share/man/ko/man1/unxz.1 +#usr/share/man/ko/man1/xz.1 +#usr/share/man/ko/man1/xzcat.1 +#usr/share/man/ko/man1/xzcmp.1 +#usr/share/man/ko/man1/xzdec.1 +#usr/share/man/ko/man1/xzdiff.1 +#usr/share/man/ko/man1/xzegrep.1 +#usr/share/man/ko/man1/xzfgrep.1 +#usr/share/man/ko/man1/xzgrep.1 +#usr/share/man/ko/man1/xzless.1 +#usr/share/man/ko/man1/xzmore.1 #usr/share/man/man1/lzcat.1 #usr/share/man/man1/lzcmp.1 #usr/share/man/man1/lzdiff.1 @@ -177,3 +201,27 @@ usr/lib/liblzma.so.5.4.0 #usr/share/man/ro/man1/xzgrep.1 #usr/share/man/ro/man1/xzless.1 #usr/share/man/ro/man1/xzmore.1 +#usr/share/man/uk +#usr/share/man/uk/man1 +#usr/share/man/uk/man1/lzcat.1 +#usr/share/man/uk/man1/lzcmp.1 +#usr/share/man/uk/man1/lzdiff.1 +#usr/share/man/uk/man1/lzegrep.1 +#usr/share/man/uk/man1/lzfgrep.1 +#usr/share/man/uk/man1/lzgrep.1 +#usr/share/man/uk/man1/lzless.1 +#usr/share/man/uk/man1/lzma.1 +#usr/share/man/uk/man1/lzmadec.1 +#usr/share/man/uk/man1/lzmore.1 +#usr/share/man/uk/man1/unlzma.1 +#usr/share/man/uk/man1/unxz.1 +#usr/share/man/uk/man1/xz.1 +#usr/share/man/uk/man1/xzcat.1 +#usr/share/man/uk/man1/xzcmp.1 +#usr/share/man/uk/man1/xzdec.1 +#usr/share/man/uk/man1/xzdiff.1 +#usr/share/man/uk/man1/xzegrep.1 +#usr/share/man/uk/man1/xzfgrep.1 +#usr/share/man/uk/man1/xzgrep.1 +#usr/share/man/uk/man1/xzless.1 +#usr/share/man/uk/man1/xzmore.1 diff --git a/lfs/xz b/lfs/xz index 1e4020dde..3c9875a6e 100644 --- a/lfs/xz +++ b/lfs/xz @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 5.4.0 +VER = 5.4.1
THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 8896044ae2761561161f4dcfc1e8e0bc6a58a2a7784567156b23e589cdb80028b37655af65802a20d2631ef05c209e406424f061c0293458a41b16dbf75a4f29 +$(DL_FILE)_BLAKE2 = 64c555ccc163ea1135c7eda077ef31e5bd68975ed3b6e395d5d6e602caed13112349c72a7596c67797e007246782747f048dd4a518239d9005305932b0975d67
install : $(TARGET)
- Update from version 0.40.0 to 0.42.2 - Update of rootfile - Build converted to meson - Changelog is empty in the source tarball as is the NEWS file. There is no change log info on the webpage. The only source of change info are the commits from the git repo https://cgit.freedesktop.org/pixman/log/
Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/pixman | 5 ++--- lfs/pixman | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/config/rootfiles/common/pixman b/config/rootfiles/common/pixman index 28e7c692a..e58e467cb 100644 --- a/config/rootfiles/common/pixman +++ b/config/rootfiles/common/pixman @@ -1,9 +1,8 @@ #usr/include/pixman-1 #usr/include/pixman-1/pixman-version.h #usr/include/pixman-1/pixman.h -#usr/lib/libpixman-1.a #usr/lib/libpixman-1.la -usr/lib/libpixman-1.so +#usr/lib/libpixman-1.so usr/lib/libpixman-1.so.0 -usr/lib/libpixman-1.so.0.40.0 +usr/lib/libpixman-1.so.0.42.2 #usr/lib/pkgconfig/pixman-1.pc diff --git a/lfs/pixman b/lfs/pixman index f7a521a4d..4161fef73 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 # @@ -24,10 +24,10 @@
include Config
-VER = 0.40.0 +VER = 0.42.2
THISAPP = pixman-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 1333d2e052a0f6343e886fc4c9ca7e4823ec7bf9f1f5a3e29723107de60c7b4e67ac67fb1f97fc00e4e495358945e6d12987dd56cb9c9fd56670a9b5cb8c9e62 +$(DL_FILE)_BLAKE2 = 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957
install : $(TARGET)
@@ -69,10 +69,13 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-arm-iwmmxt - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson \ + --prefix=/usr \ + -D iwmmxt=disabled \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD)
-
Adolf Belka