Development January 2023

development@lists.ipfire.org

10 participants
59 discussions

Change to collectd.conf and collect.custom
by jon 26 Jan '23

26 Jan '23

All, I’d like to make a change to the `/etc/collectd.conf` to remove a few monitored processes. The items appear in the <Plugin processes> section of the config file. And the processes appear at the bottom of the https://ipfire.localdomain:444/cgi-bin/services.cgi WebGUI page. Why you ask? Mostly because smbd, nmbd, squidguard, qemu, or mpd are not used (at least by me!). And so the users of those items are not left out, I’d like to move those items to a `collect.custom`. So overall idea is the core processes would be in `collectd.conf` file. And the add-on processes will be in `collect.custom`. This is a snip of the plugin process section of the `collectd.conf` file: ``` <Plugin processes> <Plugin processes> Process “sshd" to Process "sshd" Process “smbd" this Process "squid" Process “nmbd” ---> Process "charon" Process "squid" Process "openvpn" Process “squidguard" </Plugin> Process “charon" Process “openvpn" Process "qemu" Process "mpd" </Plugin> ``` The items removed from the `collectd.conf` file would move to `collect.custom`. <Plugin processes> Process "smbd" Process "nmbd" Process "squidguard" Process "qemu" Process "mpd" </Plugin> But the problem is I don’t want to overwrite the `/etc/collectd.custom` file incase an admin has modified it for their own use. The big question ================ So how do I change the `collectd.custom` file in `ipfire-2.x/config/collectd` AND not overwrite the admin’s `/etc/collectd.custom` file?

3 6

Scheduling of Core Update 173
by Peter Müller 26 Jan '23

26 Jan '23

Hello development folks, above all, sorry for me being rather absent recently due to the usual bunch of things on my plate, and the day only having 24 hours, which is way too little for me to get all of that done. [Insert a Monthy Python-style "anyway" here...] With regards to Core Update 173, we already have quite something in it, including a brand new kernel (thanks, Arne!), the QMI feature developed by Michael, and a lot of other things that I currently cannot recall, but will once I'm writing the changelog. >From my side, updates for Tor, libloc and the Squid ASNBL helper are still missing, and I will take care of that in due course. Aside from that, I'm working through patchwork, and will get back to the authors of patches I have not merged so far later, if necessary. Closing the Core Update by the end of this week seems sensible to me, so we can give it an extended testing phase, given the plethora of changes in it - in case of QMI, we suspect it will break IPTV, but none of the core developers is able to test that. Please keep the patches coming (many thanks for them, as always), and let me know if there are any questions/concerns/comments. Thanks, and best regards, Peter Müller (back to the batcave :-)

3 4

[PATCH 1/2] cairo: Update to version 1.17.6
by Adolf Belka 25 Jan '23

25 Jan '23

- 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(a)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(a)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(a)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(a)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(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)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; - -- 2.39.1

1 5

[PATCH 1/2] docbook-xsl: Update to 1.79.2
by Stefan Schantl 25 Jan '23

25 Jan '23

This is an update to the latest available version. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- docbook-xsl/Makefile | 52 --- docbook-xsl/docbook-xsl.nm | 57 ++- .../patches/docbook-xsl-list-item-body.patch | 110 ----- docbook-xsl/patches/docbook-xsl-mandir.patch | 19 - .../patches/docbook-xsl-marginleft.patch | 100 ----- .../patches/docbook-xsl-newmethods.patch | 394 ------------------ ...docbook-xsl-non-constant-expressions.patch | 25 -- .../patches/docbook-xsl-pagesetup.patch | 227 ---------- 8 files changed, 36 insertions(+), 948 deletions(-) delete mode 100644 docbook-xsl/Makefile delete mode 100644 docbook-xsl/patches/docbook-xsl-list-item-body.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-mandir.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-marginleft.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-newmethods.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-pagesetup.patch diff --git a/docbook-xsl/Makefile b/docbook-xsl/Makefile deleted file mode 100644 index 281656dec..000000000 --- a/docbook-xsl/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -BINDIR = /usr/bin -DESTDIR = ..overridden in spec file.. - -all: install - -install: install-xsl install-img install-extensions install-misc install-epub - -install-xsl: - mkdir -p $(DESTDIR)/{common,eclipse,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website} - cp common/*.dtd $(DESTDIR)/common - cp common/*.ent $(DESTDIR)/common - cp common/*.xml $(DESTDIR)/common - cp common/*.xsl $(DESTDIR)/common - cp eclipse/*.xsl $(DESTDIR)/eclipse - cp fo/*.xml $(DESTDIR)/fo - cp fo/*.xsl $(DESTDIR)/fo - cp html/*.xml $(DESTDIR)/html - cp html/*.xsl $(DESTDIR)/html - cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp - cp javahelp/*.xsl $(DESTDIR)/javahelp - cp lib/*.xsl $(DESTDIR)/lib - cp template/*.xsl $(DESTDIR)/template - cp xhtml/*.xsl $(DESTDIR)/xhtml - cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1 - cp manpages/*.xsl $(DESTDIR)/manpages - cp profiling/*.xsl $(DESTDIR)/profiling - cp highlighting/*.xml $(DESTDIR)/highlighting - cp highlighting/*.xsl $(DESTDIR)/highlighting - cp roundtrip/*.xml $(DESTDIR)/roundtrip - cp roundtrip/*.xsl $(DESTDIR)/roundtrip - cp roundtrip/*.dtd $(DESTDIR)/roundtrip - cp website/*.xsl $(DESTDIR)/website - -install-img: - mkdir -p $(DESTDIR)/images/callouts - cp images/*.gif $(DESTDIR)/images - cp images/*.png $(DESTDIR)/images - cp images/*.svg $(DESTDIR)/images - cp images/callouts/*.png $(DESTDIR)/images/callouts - cp images/callouts/*.gif $(DESTDIR)/images/callouts - cp images/callouts/*.svg $(DESTDIR)/images/callouts - -install-extensions: - mkdir -p $(DESTDIR)/extensions - cp -r extensions/* $(DESTDIR)/extensions - -install-epub: - mkdir -p $(DESTDIR)/epub - cp -r epub/* ${DESTDIR}/epub - -install-misc: - cp VERSION $(DESTDIR) diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm index 028fdc8b6..f3a7a11b2 100644 --- a/docbook-xsl/docbook-xsl.nm +++ b/docbook-xsl/docbook-xsl.nm @@ -4,12 +4,12 @@ ############################################################################### name = docbook-xsl -version = 1.76.1 -release = 3 +version = 1.79.2 +release = 1 arch = noarch groups = Applications/Text -url = http://docbook.sourceforge.net/projects/xsl/ +url = https://docbook.sourceforge.net/projects/xsl/ license = GPLv2+ summary = Norman Walsh's XSL stylesheets for DocBook XML. @@ -18,29 +18,36 @@ description other formats, such as HTML, FO, and XHMTL. They are highly customizable. end -source_dl = http://prdownloads.sourceforge.net/docbook/ +source_dl = https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{v… -sources =\ - %{thisapp}.tar.bz2 \ - %{name}-doc-%{version}.tar.bz2 +sources = %{thisapp}.tar.bz2 build - prepare_cmds - cp -av %{DIR_SOURCE}/Makefile %{DIR_APP}/Makefile + build + # Nothing to do. end - build = # empty + install + # Create directory layout. + mkdir -pv %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version} - make_install_targets +=\ - BINDIR=%{BUILDROOT}/usr/bin \ - DESTDIR=%{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version} + # Install catalog files. + cp -avf [[:lower:]]* %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/ + cp -avf VERSION %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/VERSION.xsl + + ln -svf VERSION.xsl \ + %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/VERSION + ln -svf xsl-ns-stylesheets-%{version} \ + %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets + + # Don't ship install shell script. + rm -rvf %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets/install.sh - install_cmds # Remove buggy extensions. - rm -rfv %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/extensions/* + rm -rfv %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-stylesheets-%{version}/extensions/* # Remove unneeded tool for .epub formats. - rm -rvf %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/epub + rm -rvf %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-stylesheets-%{version}/epub end end @@ -62,25 +69,33 @@ packages # Install catalog files. /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog end script preun # Uninstall catalog files. /usr/bin/xmlcatalog --noout --del \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog end end end diff --git a/docbook-xsl/patches/docbook-xsl-list-item-body.patch b/docbook-xsl/patches/docbook-xsl-list-item-body.patch deleted file mode 100644 index a3d3819f7..000000000 --- a/docbook-xsl/patches/docbook-xsl-list-item-body.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl ---- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200 -@@ -248,9 +248,17 @@ - </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> -- <fo:block> -- <xsl:apply-templates/> -- </fo:block> -+ <xsl:choose> -+  -+ <xsl:when test="$passivetex.extensions = '1'"> -+ <xsl:apply-templates/> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:block> -+ <xsl:apply-templates/> -+ </fo:block> -+ </xsl:otherwise> -+ </xsl:choose> - </fo:list-item-body> - </xsl:variable> - -@@ -446,10 +454,18 @@ - </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> -- <fo:block> -- <xsl:apply-templates select="listitem"/> -- </fo:block> -- </fo:list-item-body> -+ <xsl:choose> -+  -+ <xsl:when test="$passivetex.extensions = '1'"> -+ <xsl:apply-templates select="listitem"/> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:block> -+ <xsl:apply-templates select="listitem"/> -+ </fo:block> -+ </xsl:otherwise> -+ </xsl:choose> -+ </fo:list-item-body> - </xsl:variable> - - <xsl:choose> -@@ -925,9 +941,17 @@ - </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> -- <fo:block> -- <xsl:apply-templates/> -- </fo:block> -+ <xsl:choose> -+  -+ <xsl:when test="$passivetex.extensions = '1'"> -+ <xsl:apply-templates/> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:block> -+ <xsl:apply-templates/> -+ </fo:block> -+ </xsl:otherwise> -+ </xsl:choose> - </fo:list-item-body> - </fo:list-item> - </xsl:template> -@@ -951,9 +975,17 @@ - </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> -- <fo:block> -- <xsl:apply-templates/> -- </fo:block> -+ <xsl:choose> -+  -+ <xsl:when test="$passivetex.extensions = '1'"> -+ <xsl:apply-templates/> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:block> -+ <xsl:apply-templates/> -+ </fo:block> -+ </xsl:otherwise> -+ </xsl:choose> - </fo:list-item-body> - </fo:list-item> - </xsl:template> -@@ -1141,9 +1173,17 @@ - </fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> -- <fo:block> -- <xsl:apply-templates/> -- </fo:block> -+ <xsl:choose> -+  -+ <xsl:when test="$passivetex.extensions = '1'"> -+ <xsl:apply-templates/> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:block> -+ <xsl:apply-templates/> -+ </fo:block> -+ </xsl:otherwise> -+ </xsl:choose> - </fo:list-item-body> - </fo:list-item> - </xsl:template> diff --git a/docbook-xsl/patches/docbook-xsl-mandir.patch b/docbook-xsl/patches/docbook-xsl-mandir.patch deleted file mode 100644 index d2c5a7e47..000000000 --- a/docbook-xsl/patches/docbook-xsl-mandir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpages/other.xsl ---- docbook-xsl-1.76.1-orig/manpages/other.xsl 2010-08-27 05:14:52.000000000 +0200 -+++ docbook-xsl-1.76.1/manpages/other.xsl 2011-09-06 17:17:07.973737258 +0200 -@@ -595,7 +595,14 @@ manvolnum - <xsl:with-param name="message-prolog">Note: </xsl:with-param> - <xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param> - <xsl:with-param name="content"> -- <xsl:value-of select="'.so '"/> -+ <xsl:choose> -+ <xsl:when test="$man.output.in.separate.dir = 0"> -+ <xsl:value-of select="concat('.so man', $section, '/')"/> -+ </xsl:when> -+ <xsl:otherwise> -+ <xsl:value-of select="'.so '"/>  -+ </xsl:otherwise> -+ </xsl:choose> - <xsl:call-template name="make.adjusted.man.filename"> - <xsl:with-param name="name" select="$first.refname"/> - <xsl:with-param name="section" select="$section"/> diff --git a/docbook-xsl/patches/docbook-xsl-marginleft.patch b/docbook-xsl/patches/docbook-xsl-marginleft.patch deleted file mode 100644 index 31c1b84d2..000000000 --- a/docbook-xsl/patches/docbook-xsl-marginleft.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl ---- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -324,7 +324,7 @@ - </xsl:when> - <xsl:when test="@termlength"> - <xsl:variable name="termlength.is.number"> -- <xsl:value-of select="@termlength + 0"/> -+ <xsl:value-of select="@termlength"/> - </xsl:variable> - <xsl:choose> - <xsl:when test="string($termlength.is.number) = 'NaN'"> -@@ -333,15 +333,7 @@ - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="@termlength"/> -- <xsl:choose> --  -- <xsl:when test="$passivetex.extensions != 0"> -- <xsl:text>em</xsl:text> -- </xsl:when> -- <xsl:otherwise> -- <xsl:text>em * 0.60</xsl:text> -- </xsl:otherwise> -- </xsl:choose> -+ <xsl:text>em</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:when> -@@ -350,15 +342,7 @@ - <xsl:with-param name="terms" select="varlistentry/term"/> - <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/> - </xsl:call-template> -- <xsl:choose> --  -- <xsl:when test="$passivetex.extensions != 0"> -- <xsl:text>em</xsl:text> -- </xsl:when> -- <xsl:otherwise> -- <xsl:text>em * 0.60</xsl:text> -- </xsl:otherwise> -- </xsl:choose> -+ <xsl:text>em</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> -@@ -372,17 +356,7 @@ - - <xsl:variable name="label-separation">1em</xsl:variable> - <xsl:variable name="distance-between-starts"> -- <xsl:choose> --  -- <xsl:when test="$passivetex.extensions != 0"> -- <xsl:value-of select="$termlength"/> -- </xsl:when> -- <xsl:otherwise> -- <xsl:value-of select="$termlength"/> -- <xsl:text>+</xsl:text> -- <xsl:value-of select="$label-separation"/> -- </xsl:otherwise> -- </xsl:choose> -+ <xsl:value-of select="$termlength"/> - </xsl:variable> - - <xsl:if test="title"> -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -133,8 +133,8 @@ - <xsl:attribute-set name="component.title.properties"> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> -- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute> -- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute> -+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute> -+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align"> - <xsl:choose> -diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl ---- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200 -+++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200 -@@ -30,16 +30,7 @@ - </xsl:param> - - <xsl:param name="margin.left.inner"> -- <xsl:choose> -- <xsl:when test="$passivetex.extensions != 0"> -- <xsl:value-of select="$page.margin.inner"/> -- </xsl:when> -- <xsl:otherwise> -- <xsl:value-of select="$page.margin.inner"/> -- <xsl:text> - </xsl:text> -- <xsl:value-of select="$title.margin.left"/> -- </xsl:otherwise> -- </xsl:choose> -+ <xsl:value-of select="$page.margin.inner"/> - </xsl:param> - - <xsl:template name="setup.pagemasters"> diff --git a/docbook-xsl/patches/docbook-xsl-newmethods.patch b/docbook-xsl/patches/docbook-xsl-newmethods.patch deleted file mode 100644 index debc51ba0..000000000 --- a/docbook-xsl/patches/docbook-xsl-newmethods.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl ---- docbook-xsl-1.74.0.orig/html/docbook.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/html/docbook.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -26,6 +26,7 @@ - <xsl:include href="../VERSION"/> - <xsl:include href="param.xsl"/> - <xsl:include href="../lib/lib.xsl"/> -+<xsl:include href="../lib/dumpfragment.xsl"/> - <xsl:include href="../common/l10n.xsl"/> - <xsl:include href="../common/common.xsl"/> - <xsl:include href="../common/utility.xsl"/> -@@ -44,6 +45,7 @@ - <xsl:include href="graphics.xsl"/> - <xsl:include href="xref.xsl"/> - <xsl:include href="formal.xsl"/> -+<xsl:include href="dtbl.xsl"/> - <xsl:include href="table.xsl"/> - <xsl:include href="htmltbl.xsl"/> - <xsl:include href="sections.xsl"/> -diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl ---- docbook-xsl-1.74.0.orig/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ docbook-xsl-1.74.0/html/dtbl.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -0,0 +1,293 @@ -+<?xml version="1.0" encoding="US-ASCII"?> -+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns:exsl="http://exslt.org/common" -+ xmlns:func="http://exslt.org/functions" -+ xmlns:dtbl="http://docbook.sourceforge.net/dtbl" -+ extension-element-prefixes="func" -+ exclude-result-prefixes="exsl func dtbl" -+ version="1.0"> -+ -+<func:function name="dtbl:convertLength"> -+ <xsl:param name="arbitrary.length"/> -+ -+ <xsl:variable name="pixels.per.inch" select="96"/> -+ -+ <xsl:variable name="unscaled.length" -+ select="translate($arbitrary.length, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ', '')"/> -+ -+ <xsl:variable name="units" -+ select="translate($arbitrary.length,'+-0123456789. ', '')"/> -+ -+ <xsl:variable name="scaled.length"> -+ <xsl:choose> -+ <xsl:when test="$units='in'"> -+ <xsl:value-of select="$unscaled.length * $pixels.per.inch"/> -+ </xsl:when> -+ <xsl:when test="$units='cm'"> -+ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 2.54)"/> -+ </xsl:when> -+ <xsl:when test="$units='mm'"> -+ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 25.4)"/> -+ </xsl:when> -+ <xsl:when test="$units='pc'"> -+ <xsl:value-of select="$unscaled.length * (($pixels.per.inch div 72) * 12)"/> -+ </xsl:when> -+ <xsl:when test="$units='pt'"> -+ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 72)"/> -+ </xsl:when> -+ <xsl:when test="$units='px' or $units=''"> -+ <xsl:value-of select="$unscaled.length"/> -+ </xsl:when> -+ <xsl:otherwise> -+ <xsl:message terminate="no"> -+ <xsl:text>"</xsl:text> -+ <xsl:value-of select="$units"/> -+ <xsl:text>" is not a known unit. Applying scaling factor of 1 instead.</xsl:text> -+ </xsl:message> -+ <xsl:value-of select="$unscaled.length"/> -+ </xsl:otherwise> -+ </xsl:choose> -+ </xsl:variable> -+ -+ <func:result select="round($scaled.length)"/> -+</func:function> -+ -+<func:function name="dtbl:adjustColumnWidths"> -+ <xsl:param name="colgroup"/> -+ -+ <xsl:if test="$adjustColumnWidths.debug"> -+ <xsl:message> -+ <xsl:text>entering adjustColumnWidths(</xsl:text> -+ <xsl:call-template name="dump-fragment"> -+ <xsl:with-param name="fragment" select="$colgroup"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:message> -+ </xsl:if> -+ -+ <xsl:variable name="expanded.colgroup"> -+ <xsl:apply-templates select="exsl:node-set($colgroup)/*" mode="dtbl-split-widths"/> -+ </xsl:variable> -+ -+ <xsl:variable name="absolute.widths.total"> -+ <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@abswidth)"/> -+ </xsl:variable> -+ -+ <xsl:variable name="relative.widths.total"> -+ <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@relwidth)"/> -+ </xsl:variable> -+ -+ <xsl:if test="$adjustColumnWidths.debug"> -+ <xsl:message> -+ <xsl:text>total relative widths = (</xsl:text> -+ <xsl:value-of select="$relative.widths.total"/> -+ <xsl:text>)</xsl:text> -+ </xsl:message> -+ <xsl:message> -+ <xsl:text>total absolute widths = (</xsl:text> -+ <xsl:value-of select="$absolute.widths.total"/> -+ <xsl:text>)</xsl:text> -+ </xsl:message> -+ </xsl:if> -+ -+ <xsl:variable name="adjusted.colgroup"> -+ <xsl:choose> -+ <xsl:when test="$relative.widths.total = 0"> -+ <xsl:if test="$adjustColumnWidths.debug"> -+ <xsl:message>all widths are absolute</xsl:message> -+ </xsl:if> -+ <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*" -+ mode="dtbl-use-absolute-widths"/> -+ </xsl:when> -+ <xsl:when test="$absolute.widths.total = 0"> -+ <xsl:if test="$adjustColumnWidths.debug"> -+ <xsl:message>all widths are relative</xsl:message> -+ </xsl:if> -+ <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*" -+ mode="dtbl-use-relative-widths"> -+ <xsl:with-param name="relative.widths.total" -+ select="$relative.widths.total"/> -+ </xsl:apply-templates> -+ </xsl:when> -+ </xsl:choose> -+ </xsl:variable> -+ -+ <xsl:variable name="corrected.adjusted.colgroup"> -+ <xsl:choose> -+ <xsl:when test="$relative.widths.total = 0"> -+ <xsl:copy-of select="$adjusted.colgroup"/> -+ </xsl:when> -+ <xsl:otherwise> -+ <xsl:variable name="widths.total" -+ select="sum(exsl:node-set($adjusted.colgroup)//col/@width)"/> -+ <xsl:variable name="n.columns" -+ select="count(exsl:node-set($adjusted.colgroup)//col)"/> -+ <xsl:variable name="error" -+ select="100 - $widths.total"/> -+ <xsl:variable name="first.bad.column" -+ select="($n.columns - $error) + 1"/> -+ <xsl:apply-templates select="exsl:node-set($adjusted.colgroup)/*" -+ mode="dtbl-correct-rounding-error"> -+ <xsl:with-param name="first.bad.column" -+ select="$first.bad.column"/> -+ </xsl:apply-templates> -+ </xsl:otherwise> -+ </xsl:choose> -+ </xsl:variable> -+ -+ <xsl:if test="$adjustColumnWidths.debug"> -+ <xsl:message> -+ <xsl:text>result = (</xsl:text> -+ <xsl:call-template name="dump-fragment"> -+ <xsl:with-param name="fragment" select="$corrected.adjusted.colgroup"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:message> -+ </xsl:if> -+ -+ <func:result select="$corrected.adjusted.colgroup"/> -+</func:function> -+ -+<xsl:template match="colgroup" mode="dtbl-correct-rounding-error"> -+ <xsl:param name="first.bad.column"/> -+ -+ <xsl:if test="$adjustColumnWidths.debug"> -+ <xsl:message> -+ <xsl:text>first.bad.column = (</xsl:text> -+ <xsl:value-of select="$first.bad.column"/> -+ <xsl:text>)</xsl:text> -+ </xsl:message> -+ </xsl:if> -+ -+ <colgroup> -+ <xsl:for-each select="col[position() < $first.bad.column]"> -+ <xsl:element name="col"> -+ <xsl:attribute name="width"> -+ <xsl:value-of select="concat(@width, '%')"/> -+ </xsl:attribute> -+ </xsl:element> -+ </xsl:for-each> -+ <xsl:for-each select="col[position() >= $first.bad.column]"> -+ <xsl:element name="col"> -+ <xsl:attribute name="width"> -+ <xsl:value-of select="concat(@width + 1, '%')"/> -+ </xsl:attribute> -+ </xsl:element> -+ </xsl:for-each> -+ </colgroup> -+</xsl:template> -+ -+<xsl:template match="col" mode="dtbl-correct-rounding-error"> -+ <xsl:param name="relative.widths.total"/> -+ <xsl:param name="error"/> -+ -+ <xsl:element name="col"> -+ <xsl:attribute name="width"> -+ <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/> -+ </xsl:attribute> -+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> -+ </xsl:element> -+</xsl:template> -+ -+<xsl:template match="colgroup" mode="dtbl-use-relative-widths"> -+ <xsl:param name="relative.widths.total"/> -+ -+ <colgroup> -+ <xsl:apply-templates mode="dtbl-use-relative-widths"> -+ <xsl:with-param name="relative.widths.total" -+ select="$relative.widths.total"/> -+ </xsl:apply-templates> -+ </colgroup> -+</xsl:template> -+ -+<xsl:template match="col" mode="dtbl-use-relative-widths"> -+ <xsl:param name="relative.widths.total"/> -+ -+ <xsl:element name="col"> -+ <xsl:attribute name="width"> -+ <xsl:value-of select="round((@relwidth div $relative.widths.total) * 100)"/> -+ </xsl:attribute> -+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> -+ </xsl:element> -+</xsl:template> -+ -+<xsl:template match="colgroup" mode="dtbl-use-absolute-widths"> -+ <colgroup> -+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> -+ </colgroup> -+</xsl:template> -+ -+<xsl:template match="col" mode="dtbl-use-absolute-widths"> -+ <xsl:element name="col"> -+ <xsl:attribute name="width"> -+ <xsl:value-of select="@abswidth"/> -+ </xsl:attribute> -+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/> -+ </xsl:element> -+</xsl:template> -+ -+<xsl:template match="colgroup" mode="dtbl-split-widths"> -+ <colgroup> -+ <xsl:apply-templates mode="dtbl-split-widths"/> -+ </colgroup> -+</xsl:template> -+ -+<xsl:template match="col" mode="dtbl-split-widths"> -+ -+  -+ <xsl:variable name="width"> -+ <xsl:choose> -+ <xsl:when test="@width != ''"> -+ <xsl:value-of select="@width"/> -+ </xsl:when> -+ <xsl:otherwise> -+ <xsl:text>1*</xsl:text> -+ </xsl:otherwise> -+ </xsl:choose> -+ </xsl:variable> -+ -+  -+ <xsl:variable name="absolute.width"> -+ <xsl:choose> -+ <xsl:when test="contains($width, '*')"> -+ <xsl:value-of select="substring-after($width, '*')"/> -+ </xsl:when> -+ <xsl:otherwise> -+ <xsl:value-of select="$width"/> -+ </xsl:otherwise> -+ </xsl:choose> -+ </xsl:variable> -+ -+ <xsl:variable name="converted.absolute.width"> -+ <xsl:choose> -+ <xsl:when test="$absolute.width != ''"> -+ <xsl:value-of select="dtbl:convertLength($absolute.width)"/> -+ </xsl:when> -+ <xsl:otherwise>0</xsl:otherwise> -+ </xsl:choose> -+ </xsl:variable> -+ -+ <xsl:variable name="relative.width"> -+ <xsl:choose> -+ <xsl:when test="substring-before($width, '*') != ''"> -+ <xsl:value-of select="substring-before($width, '*')"/> -+ </xsl:when> -+ <xsl:otherwise>0</xsl:otherwise> -+ </xsl:choose> -+ </xsl:variable> -+ -+ <xsl:element name="col"> -+ <xsl:attribute name="width"> -+ <xsl:value-of select="$width"/> -+ </xsl:attribute> -+ <xsl:attribute name="relwidth"> -+ <xsl:value-of select="$relative.width"/> -+ </xsl:attribute> -+ <xsl:attribute name="abswidth"> -+ <xsl:value-of select="$converted.absolute.width"/> -+ </xsl:attribute> -+ <xsl:apply-templates mode="dtbl-split-widths"/> -+ </xsl:element> -+</xsl:template> -+ -+</xsl:stylesheet> -diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl ---- docbook-xsl-1.74.0.orig/html/table.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/html/table.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -5,7 +5,8 @@ - xmlns:xtbl="xalan://com.nwalsh.xalan.Table" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table" -- exclude-result-prefixes="doc stbl xtbl lxslt ptbl" -+ xmlns:dtbl="http://docbook.sourceforge.net/dtbl" -+ exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl" - version='1.0'> - - <xsl:include href="../common/table.xsl"/> -@@ -365,6 +366,9 @@ - <xsl:when test="$use.extensions != 0 - and $tablecolumns.extension != 0"> - <xsl:choose> -+ <xsl:when test="function-available('dtbl:convertLength')"> -+ <xsl:value-of select="dtbl:convertLength($table.width)"/> -+ </xsl:when> - <xsl:when test="function-available('stbl:convertLength')"> - <xsl:value-of select="stbl:convertLength($table.width)"/> - </xsl:when> -@@ -389,6 +393,9 @@ - <xsl:when test="$use.extensions != 0 - and $tablecolumns.extension != 0"> - <xsl:choose> -+ <xsl:when test="function-available('dtbl:adjustColumnWidths')"> -+ <xsl:copy-of select="dtbl:adjustColumnWidths($colgroup)"/> -+ </xsl:when> - <xsl:when test="function-available('stbl:adjustColumnWidths')"> - <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/> - </xsl:when> -diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl ---- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ docbook-xsl-1.74.0/lib/dumpfragment.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -0,0 +1,30 @@ -+<?xml version="1.0" encoding="US-ASCII"?> -+<xsl:stylesheet version="1.0" -+ xmlns:exsl="http://exslt.org/common" -+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns="http://www.w3.org/1999/xhtml" -+ exclude-result-prefixes="exsl"> -+ -+<xsl:template name="dump-fragment"> -+ <xsl:param name="fragment"/> -+ <xsl:apply-templates select="exsl:node-set($fragment)/*" mode="dump-fragment"/> -+</xsl:template> -+ -+<xsl:template match="@*" mode="dump-fragment"> -+ <xsl:text> </xsl:text> -+ <xsl:value-of select="local-name(.)"/> -+ <xsl:text>="</xsl:text> -+ <xsl:value-of select="."/> -+ <xsl:text>"</xsl:text> -+</xsl:template> -+ -+<xsl:template match="*" mode="dump-fragment"> -+ <xsl:text><</xsl:text><xsl:value-of select="local-name(.)"/> -+ <xsl:apply-templates select="@*" mode="dump-fragment"/> -+ <xsl:text>></xsl:text> -+ <xsl:apply-templates mode="dump-fragment"/> -+ <xsl:text></</xsl:text><xsl:value-of select="local-name(.)"/> -+ <xsl:text>></xsl:text> -+</xsl:template> -+ -+</xsl:stylesheet> -diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.xsl ---- docbook-xsl-1.76.0-orig/html/param.xsl 2010-08-31 09:27:22.000000000 +0200 -+++ docbook-xsl-1.76.0/html/param.xsl 2010-09-06 11:01:07.916914161 +0200 -@@ -68,6 +68,7 @@ div.annotation-close { position: absolut - http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param> - <xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param> - -+<xsl:param name="adjustColumnWidths.debug" select="false()"/> - <xsl:param name="annotation.js"> - <xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param> - diff --git a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch b/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch deleted file mode 100644 index 0c3f6be74..000000000 --- a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:38:36.000000000 +0200 -@@ -23,8 +23,8 @@ - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute> -- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute> -- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute> -+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat(($body.font.master * 0.8), 'pt')"/></xsl:attribute> -+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat(($body.font.master * 1.2), 'pt')"/></xsl:attribute> - <xsl:attribute name="hyphenate">false</xsl:attribute> - <xsl:attribute name="text-align">center</xsl:attribute> - </xsl:attribute-set> -@@ -334,8 +334,8 @@ set toc,title - <xsl:attribute name="font-weight">bold</xsl:attribute> - <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute> - <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute> -- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"/></xsl:attribute> -- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"/></xsl:attribute> -+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat(($body.font.master * 0.8),'pt')"/></xsl:attribute> -+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat(($body.font.master * 1.2),'pt')"/></xsl:attribute> - <xsl:attribute name="start-indent">0pt</xsl:attribute> - </xsl:attribute-set> - <xsl:attribute-set name="index.entry.properties"> diff --git a/docbook-xsl/patches/docbook-xsl-pagesetup.patch b/docbook-xsl/patches/docbook-xsl-pagesetup.patch deleted file mode 100644 index e4d77ffca..000000000 --- a/docbook-xsl/patches/docbook-xsl-pagesetup.patch +++ /dev/null @@ -1,227 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl ---- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 -@@ -1697,36 +1697,81 @@ - <xsl:with-param name="gentext-key" select="$gentext-key"/> - </xsl:call-template> - -- <fo:table-column column-number="1"> -- <xsl:attribute name="column-width"> -- <xsl:text>proportional-column-width(</xsl:text> -- <xsl:call-template name="header.footer.width"> -- <xsl:with-param name="location">header</xsl:with-param> -- <xsl:with-param name="position" select="$column1"/> -- </xsl:call-template> -- <xsl:text>)</xsl:text> -- </xsl:attribute> -- </fo:table-column> -- <fo:table-column column-number="2"> -- <xsl:attribute name="column-width"> -- <xsl:text>proportional-column-width(</xsl:text> -- <xsl:call-template name="header.footer.width"> -- <xsl:with-param name="location">header</xsl:with-param> -- <xsl:with-param name="position" select="2"/> -- </xsl:call-template> -- <xsl:text>)</xsl:text> -- </xsl:attribute> -- </fo:table-column> -- <fo:table-column column-number="3"> -- <xsl:attribute name="column-width"> -- <xsl:text>proportional-column-width(</xsl:text> -- <xsl:call-template name="header.footer.width"> -- <xsl:with-param name="location">header</xsl:with-param> -- <xsl:with-param name="position" select="$column3"/> -- </xsl:call-template> -- <xsl:text>)</xsl:text> -- </xsl:attribute> -- </fo:table-column> -+ <xsl:choose> -+ <xsl:when test="$passivetex.extensions != 0"> -+ <fo:table-column column-number="1"> -+ <xsl:attribute name="column-width"> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">header</xsl:with-param> -+ <xsl:with-param name="position" select="$column1"/> -+ </xsl:call-template> -+ <xsl:text>%</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:table-column column-number="1"> -+ <xsl:attribute name="column-width"> -+ <xsl:text>proportional-column-width(</xsl:text> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">header</xsl:with-param> -+ <xsl:with-param name="position" select="$column1"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:otherwise> -+ </xsl:choose> -+ <xsl:choose> -+ <xsl:when test="$passivetex.extensions != 0"> -+ <fo:table-column column-number="2"> -+ <xsl:attribute name="column-width"> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">header</xsl:with-param> -+ <xsl:with-param name="position" select="2"/> -+ </xsl:call-template> -+ <xsl:text>%</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:table-column column-number="2"> -+ <xsl:attribute name="column-width"> -+ <xsl:text>proportional-column-width(</xsl:text> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">header</xsl:with-param> -+ <xsl:with-param name="position" select="2"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:otherwise> -+ </xsl:choose> -+ <xsl:choose> -+ <xsl:when test="$passivetex.extensions != 0"> -+ <fo:table-column column-number="3"> -+ <xsl:attribute name="column-width"> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">header</xsl:with-param> -+ <xsl:with-param name="position" select="$column3"/> -+ </xsl:call-template> -+ <xsl:text>%</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:table-column column-number="3"> -+ <xsl:attribute name="column-width"> -+ <xsl:text>proportional-column-width(</xsl:text> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">header</xsl:with-param> -+ <xsl:with-param name="position" select="$column3"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:otherwise> -+ </xsl:choose> - - <fo:table-body> - <fo:table-row> -@@ -2021,36 +2066,81 @@ - <xsl:with-param name="sequence" select="$sequence"/> - <xsl:with-param name="gentext-key" select="$gentext-key"/> - </xsl:call-template> -- <fo:table-column column-number="1"> -- <xsl:attribute name="column-width"> -- <xsl:text>proportional-column-width(</xsl:text> -- <xsl:call-template name="header.footer.width"> -- <xsl:with-param name="location">footer</xsl:with-param> -- <xsl:with-param name="position" select="$column1"/> -- </xsl:call-template> -- <xsl:text>)</xsl:text> -- </xsl:attribute> -- </fo:table-column> -- <fo:table-column column-number="2"> -- <xsl:attribute name="column-width"> -- <xsl:text>proportional-column-width(</xsl:text> -- <xsl:call-template name="header.footer.width"> -- <xsl:with-param name="location">footer</xsl:with-param> -- <xsl:with-param name="position" select="2"/> -- </xsl:call-template> -- <xsl:text>)</xsl:text> -- </xsl:attribute> -- </fo:table-column> -- <fo:table-column column-number="3"> -- <xsl:attribute name="column-width"> -- <xsl:text>proportional-column-width(</xsl:text> -- <xsl:call-template name="header.footer.width"> -- <xsl:with-param name="location">footer</xsl:with-param> -- <xsl:with-param name="position" select="$column3"/> -- </xsl:call-template> -- <xsl:text>)</xsl:text> -- </xsl:attribute> -- </fo:table-column> -+ <xsl:choose> -+ <xsl:when test="$passivetex.extensions != 0"> -+ <fo:table-column column-number="1"> -+ <xsl:attribute name="column-width"> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">footer</xsl:with-param> -+ <xsl:with-param name="position" select="$column1"/> -+ </xsl:call-template> -+ <xsl:text>%</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:table-column column-number="1"> -+ <xsl:attribute name="column-width"> -+ <xsl:text>proportional-column-width(</xsl:text> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">footer</xsl:with-param> -+ <xsl:with-param name="position" select="$column1"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:otherwise> -+ </xsl:choose> -+ <xsl:choose> -+ <xsl:when test="$passivetex.extensions != 0"> -+ <fo:table-column column-number="2"> -+ <xsl:attribute name="column-width"> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">footer</xsl:with-param> -+ <xsl:with-param name="position" select="2"/> -+ </xsl:call-template> -+ <xsl:text>%</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:table-column column-number="2"> -+ <xsl:attribute name="column-width"> -+ <xsl:text>proportional-column-width(</xsl:text> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">footer</xsl:with-param> -+ <xsl:with-param name="position" select="2"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:otherwise> -+ </xsl:choose> -+ <xsl:choose> -+ <xsl:when test="$passivetex.extensions != 0"> -+ <fo:table-column column-number="3"> -+ <xsl:attribute name="column-width"> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">footer</xsl:with-param> -+ <xsl:with-param name="position" select="$column3"/> -+ </xsl:call-template> -+ <xsl:text>%</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:when> -+ <xsl:otherwise> -+ <fo:table-column column-number="3"> -+ <xsl:attribute name="column-width"> -+ <xsl:text>proportional-column-width(</xsl:text> -+ <xsl:call-template name="header.footer.width"> -+ <xsl:with-param name="location">footer</xsl:with-param> -+ <xsl:with-param name="position" select="$column3"/> -+ </xsl:call-template> -+ <xsl:text>)</xsl:text> -+ </xsl:attribute> -+ </fo:table-column> -+ </xsl:otherwise> -+ </xsl:choose> - - <fo:table-body> - <fo:table-row> -- 2.30.2

1 1

[PATCH] nano: Update to 7.2
by Matthias Fischer 25 Jan '23

25 Jan '23

For details see: https://lists.gnu.org/archive/html/info-gnu/2023-01/msg00007.html " ... The specific issue that was addressed in this release: https://savannah.gnu.org/bugs/?63616 (pasting succeeded despite --view) Changes between v7.1 and v7.2: ------------------------------ Benno Schulenberg (12): bindings: let ^/ toggle between the 'search' and 'gotoline' menus bump version numbers and add a news item for the 7.2 release copyright: update the years for the FSF docs: give ^K and ^U some useful function in the alternative bindings docs: put the binding of ^Y after its unbinding, for it to be effective gnulib: update to its current upstream state input: disallow bracketed pastes when in view mode po: update translations and regenerate POT file and PO files syntax: html: colorize specially the other two emphasizing tags too tweaks: avoid warnings when compiling with -Wpedantic tweaks: rewrap an old news item tweaks: separate a special thanks from the preceding ones" Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/nano | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/nano b/lfs/nano index 7ec2eca48..735f4e66f 100644 --- a/lfs/nano +++ b/lfs/nano @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)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 = 7.1 +VER = 7.2 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = cc606a04b34e723da01326d617b50f79711d0b35034b3e75f410fa7e277ba3eddbb1a408a80255533d2fa953f23fee745979363d5621b63a79bd89b29d8d528e +$(DL_FILE)_BLAKE2 = c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a install : $(TARGET) -- 2.34.1

1 0

[PATCH] cmake: Update to 3.25.2
by Matthias Fischer 25 Jan '23

25 Jan '23

For details see: https://cmake.org/cmake/help/v3.25/release/3.25.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/cmake b/lfs/cmake index 0e8cd02c9..f1692d0f1 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)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 = 3.21.0 +VER = 3.25.2 THISAPP = cmake-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 70a67bc6916ea566f8ae9b48d1e6882ff834dee796f67aa01ea2a6c95ecdeaef8b6e7fe95410f8f1206a92e05bcc659d90bde5254dfb107020e52d9e938f3e8c +$(DL_FILE)_BLAKE2 = ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0 install : $(TARGET) -- 2.34.1

1 0

[PATCH] logwatch: Update to 7.8
by Matthias Fischer 25 Jan '23

25 Jan '23

The developers do not provide a changelog, this time I couldn't even find a comment. All I can say: Running her on Core 172. No seen problems. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/logwatch | 2 ++ lfs/logwatch | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/logwatch b/config/rootfiles/common/logwatch index 975ec40c1..2732215d5 100644 --- a/config/rootfiles/common/logwatch +++ b/config/rootfiles/common/logwatch @@ -95,6 +95,7 @@ usr/share/logwatch/default.conf/services/dhcpd.conf #usr/share/logwatch/default.conf/services/dnssec.conf #usr/share/logwatch/default.conf/services/dovecot.conf #usr/share/logwatch/default.conf/services/dpkg.conf +#usr/share/logwatch/default.conf/services/dropbear.conf #usr/share/logwatch/default.conf/services/emerge.conf #usr/share/logwatch/default.conf/services/evtapplication.conf #usr/share/logwatch/default.conf/services/evtmswindows.conf @@ -243,6 +244,7 @@ usr/share/logwatch/scripts/services/dialup #usr/share/logwatch/scripts/services/dnssec #usr/share/logwatch/scripts/services/dovecot #usr/share/logwatch/scripts/services/dpkg +#usr/share/logwatch/scripts/services/dropbear #usr/share/logwatch/scripts/services/emerge #usr/share/logwatch/scripts/services/evtapplication #usr/share/logwatch/scripts/services/evtmswindows diff --git a/lfs/logwatch b/lfs/logwatch index 57a605ed5..391315de4 100644 --- a/lfs/logwatch +++ b/lfs/logwatch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2023 IPFire Team <info(a)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 = 7.7 +VER = 7.8 THISAPP = logwatch-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da +$(DL_FILE)_BLAKE2 = 35480a22077e43b70d15a00cc0a3a8297c1e57c465d6fffe7a9a68a9b4fb14ef62c1d2bcae8a4ab2d70af16451b8f0b5dba8aec29beae1012501a118915edd92 install : $(TARGET) -- 2.34.1

1 0

[PATCH] gcc: fix toolchain build
by Arne Fitzenreiter 24 Jan '23

24 Jan '23

I have removed the patches instead of readd the mpfr-4.1.0 patchset because this result may result in different builds if we not update the prebuild toolchain. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- lfs/gcc | 1 - 1 file changed, 1 deletion(-) diff --git a/lfs/gcc b/lfs/gcc index f25548892..fc0921552 100644 --- a/lfs/gcc +++ b/lfs/gcc @@ -248,7 +248,6 @@ ifeq "$(TOOLCHAIN)" "1" cd $(DIR_APP) && tar xfa $(DIR_DL)/gmp-$(GMP_VER).tar.xz cd $(DIR_APP) && mv -v gmp-$(GMP_VER) gmp cd $(DIR_APP) && tar xfa $(DIR_DL)/mpfr-$(MPFR_VER).tar.xz - cd $(DIR_APP)/mpfr-$(MPFR_VER) && patch -Np1 < $(DIR_SRC)/src/patches/mpfr-4.1.0-cumulative-patches-1-to-13.patch cd $(DIR_APP) && mv -v mpfr-$(MPFR_VER) mpfr cd $(DIR_APP) && tar xfa $(DIR_DL)/mpc-$(MPC_VER).tar.gz cd $(DIR_APP) && mv -v mpc-$(MPC_VER) mpc -- 2.34.1

1 0

NSA publishes IPv6 security guidance
by Peter Müller 23 Jan '23

23 Jan '23

Hello development folks, the other day, the fluffy three-letter agency which we all love fiercely and dearly has published a security guidance on IPv6 [1]. While the PDF [2] seems to be more of a high-level overview to me, the 2010 NIST guidance mentioned in it [3] is perhaps more interesting to us, particularly with regards to networking in IPFire 3. Just wanted to highlight that here, as I was unaware of both publications thus far. Thanks, and best regards, Peter Müller [1] https://www.nsa.gov/Press-Room/News-Highlights/Article/Article/3270451/nsa-… [2] https://media.defense.gov/2023/Jan/18/2003145994/-1/-1/0/CSI_IPV6_SECURITY_… [3] https://nvlpubs.nist.gov/nistpubs/legacy/sp/nistspecialpublication800-119.p…

1 0

[PATCH 1/2] nqptp: Update to latest version in main branch
by Michael Tremer 23 Jan '23

23 Jan '23

This patch also creates symlinks that the daemon is automatically started. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- lfs/nqptp | 7 ++++--- src/paks/nqptp/install.sh | 34 ++++++++++++++++++++++++++++++++++ src/paks/nqptp/uninstall.sh | 35 +++++++++++++++++++++++++++++++++++ src/paks/nqptp/update.sh | 26 ++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 src/paks/nqptp/install.sh create mode 100644 src/paks/nqptp/uninstall.sh create mode 100644 src/paks/nqptp/update.sh diff --git a/lfs/nqptp b/lfs/nqptp index f8bf1b8fa..4e669302b 100644 --- a/lfs/nqptp +++ b/lfs/nqptp @@ -26,7 +26,8 @@ include Config SUMMARY = nqptp is a daemon that monitors timing data from any PTP clocks -VER = d900567 +# https://github.com/mikebrady/nqptp/archive/$(VER).tar.gz +VER = ad384f9ed3b2cc31e97012ab6bfe5a214ffc65a2 THISAPP = nqptp-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +35,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nqptp -PAK_VER = 2 +PAK_VER = 3 SERVICES = nqptp @@ -46,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 83db62518577bda0198e989a1274c46b0f0c658cf281fd282b4b1e51544339c00a3e6da43a472e8de50bcd3926c113ca7cd29e8e562de8b1260763d64baa069b +$(DL_FILE)_BLAKE2 = c294012959d8daa54c2a4fc1803cad620c664fc1d0e5f3a865217059b2b9b656fd1c17cfe1c260ca09dc505c7337a77cd6d09fe642c04d3936e274c192e2aaeb install : $(TARGET) diff --git a/src/paks/nqptp/install.sh b/src/paks/nqptp/install.sh new file mode 100644 index 000000000..12d93416e --- /dev/null +++ b/src/paks/nqptp/install.sh @@ -0,0 +1,34 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +# Extract everything +extract_files + +# Enable auto-start for service +ln -sf ../init.d/nqptp /etc/rc.d/rc0.d/K21nqptp +ln -sf ../init.d/nqptp /etc/rc.d/rc3.d/S98nqptp +ln -sf ../init.d/nqptp /etc/rc.d/rc6.d/K21nqptp + +exit 0 diff --git a/src/paks/nqptp/uninstall.sh b/src/paks/nqptp/uninstall.sh new file mode 100644 index 000000000..2238e0c6f --- /dev/null +++ b/src/paks/nqptp/uninstall.sh @@ -0,0 +1,35 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +# Stop the service +service_stop "${NAME}" + +# Delete all program files +remove_files + +# Disable auto-start +rm -vf /etc/rc.d/rc*.d/*nqptp + +exit 0 diff --git a/src/paks/nqptp/update.sh b/src/paks/nqptp/update.sh new file mode 100644 index 000000000..6ce09b972 --- /dev/null +++ b/src/paks/nqptp/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007-2020 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh -- 2.30.2

2 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development January 2023