[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1c7ba83fc2cb762c5250b8a2aaeaed947251472d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 1c7ba83fc2cb762c5250b8a2aaeaed947251472d (commit) via 137ce0bd117649f916463bbedb1c3a9badaf8e46 (commit) via b5a416ef60b305a13aa94fa20a90245f83788e10 (commit) via 11171bd1fbf6cf32cd5da99ed3573384f0672d6f (commit) via 93b301d845f37bed5a41503b7312c508e67f3510 (commit) via d72f0b3cae70eccce206c7ece911bc073e240e02 (commit) via c29ac3a8c0de48d75b78fcd49452bdfb8f3b02e9 (commit) via 0ba75db1c817040e70e504c4172a7a004ab0727d (commit) via d353dd36018227e7cdadb3b35b551dbd7b6ec69c (commit) via d3ce9e4fa3857f6f2b9e58d61fd65cb44d433b64 (commit) via 21eb8d54fd668be257b4774f9f13e54221f60ae9 (commit) via bb59f4627bb3ffd08c30088ae1a8e90ffb151567 (commit) via 5f722de57c2187c294b36e308293b265533ed6a6 (commit) via 86e3bdce09ed980228effcdf3fbb2c3297efa3e0 (commit) via 29d13430cb961881e8dd6f25012f6838fdf3f9f8 (commit) via 937fab2cbb73aa8d399cc09340e5f426308ae139 (commit) via 0b4290554d7058246fb37aad8dd5afa8d85fb337 (commit) via f124c9c851d2d05d4847fef0d6181d62faa4afb1 (commit) via 08634d5cd5e03b24dfbef5cc14abb5afa943e9b5 (commit) via aa51485a3aa461b6b29f47e11addbdeb79123b82 (commit) via 059cf647ad71359d904a284f048316a7df99f091 (commit) via 8d8e4c1d0e5054a5dbe12ee24d6417cb3ffdda56 (commit) via 53abba715072a7953bc223e81b7a1006e23bb216 (commit) via 80ea76fdeeee6d9c45ac5aa660f977e894f959e8 (commit) via d0f1df71258b6337371c8f06d2217bd65a1fa307 (commit) from 50059fc3282c69680626fc908dc0519d2614d616 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1c7ba83fc2cb762c5250b8a2aaeaed947251472d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 08:07:22 2024 +0100
core191: ship elinks and libidn2
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 137ce0bd117649f916463bbedb1c3a9badaf8e46 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:37:20 2024 +0100
libidn2: Required for elinks in place of libidn
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b5a416ef60b305a13aa94fa20a90245f83788e10 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:37:19 2024 +0100
elinks: Update to version 0.17.1.1
- Update from version 0.16.0 to 0.17.1.1 - Update of rootfile not required - elinks now requires libidn2 as a run time dependency in place of libidn. libidn is also required by ghostscript. If the cups removal patch is accepted, which also removes ghostscript, then at the same time libidn can be removed. - The addition of libidn2 is in another patch combined with this one. - Changelog 0.17.1.1 * bump requirements: libCSS to 0.9.2 and libdom to 0.4.2 * revert "[head] addcrlf". #281 * main, article and nav elements #282 * bashism in configure.ac #285 * eliminate GNUism in sed #305 * python module imp is deprecated #313 * fix hooks.py detection #333 * cast to unsigned char * in inpfield #315 * fix suspend in session master when fork_on_start #296 * remove 300ms startup delay and optimize fork_on_start #297 * missing <sys/cdefs.h> on systems with musl libc #306 0.17.0 * fix for some 32-bit systems and select-only builds * fix for gettext in Windows builds 0.17.0rc1 * configuration files are now saved to ~/.config/elinks/ or $XDG_CONFIG_HOME/elinks/ #199 User must copy files from ~/.elinks/ to ~/.config/elinks/ himself or herself * HOME_ETC support was dropped, you can set ELINKS_CONFDIR instead * idn2 in place of idn #206 * libcss support (a few netsurf's libraries are required). Set document.css.libcss = 1 to enable * experimental libsixel support (image/*; img2sixel %s; copiousoutput) in ~/.mailcap Must be enabled in a few places in configuration: set document.plain.sixel = 1 and in terminal options. Do not try it on metered remote connections * testing libcurl support (explicit FTPS and SFTP among others) To enable set protocol.ftp.use_curl = 1 set protocol.http.use_curl = 1 for http/https * ui.sessions.postpone_unlink option. Delete temporary files at exit instead of immediately after closing viewer #257 * redefined isspace #249 * Serbian translation update * compilation fixes 0.16.1.1 * updated POTFILES #230 0.16.1 * handle SECTION html element #207 * allocate more memory for BLOCKQUOTE #214 * encode A href to terminal codepage and encode bytes with highest bit set as %HEX #221 * Serbian translation update * install doc by default in meson #224 * tests fixes
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 11171bd1fbf6cf32cd5da99ed3573384f0672d6f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 08:04:49 2024 +0100
core191: ship perl-Imager
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 93b301d845f37bed5a41503b7312c508e67f3510 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:40 2024 +0100
perl-Imager: Update to version 1.024
- Update from version 1.012 (2020) to 1.024 - Update of rootfile - Addition of patch to fix inclusion of t1tables.h for FT_Has_PS_Glyph_Names which is no longer pulled in by ftmm.h since FreeType 2.13.3 - Changelog 1.024 - TIFF: improve reporting from a test on failure. - TIFF: support back to libtiff 4.0.8, for compatibility with RHEL and its clones. https://github.com/tonycoz/imager/issues/527 1.023 - TIFF: don't read after free when looking up a compression codec by the libtiff defined name, https://github.com/tonycoz/imager/issues/524 1.022 - TIFF: We can no longer be lazy in implementing the size callback. https://github.com/tonycoz/imager/issues/522 https://bugs.debian.org/1057270 1.021 Several TIFF changes: - require libtiff 4.1.0 or later - add buildversion, builddate and libversion methods - add the codecs method which fetches a list of available TIFF compression codes - avoid deprecation warnings from libtiff about using the old libtiff defined integer types - require vsnprintf() (C99) - remove my adaption of TIFFReadRGBATile() since libtiff now provides TIFFReadRGBATileExt() which can do the same thing - use pkg-config to find libtiff if possible - for sufficiently modern libtiff (4.5.0) use TIFFClientOptions to specify the warning and error handlers, this means we no longer need a mutex for 4.5.0 and later. - collect warnings using a buffer chain instead of custom allocation code. - include the "module" name (typically a libtiff function name) when recording libtiff warnings. - add CI to test Imager::File::TIFF against libtiff 4.1.0 through 4.6.0 - other minor fixes Other changes: - prevent CodeQL from complaining about an implicit conversion to unsigned char 1.020 - masked(): disallow negative width/height masked images - masked(): adjust source corners as bottom right relative if they are negative. - masked(): reject image source corners where either co-ordinate is negative after the above adjustment. - Imager::Files: update external image file support modules list - internal test: don't fail on Imager::File::APNG link - disable Imager::Font::T1 and Freetype 1.x fonts by default. Unpatched t1lib simply doesn't work on 64 bit systems, and no-one ships the patched version anymore. https://github.com/tonycoz/imager/issues/510 1.019 - fix palette/transparency table generation when writing paletted PNG images with tranparency. This happened to work for the test case, but the mechanism used to generate the palette order preserved most palette index positions, which hid the problem with actually generating the PLTE and tRNS chunks. https://github.com/tonycoz/imager/issues/499 - added lowish-level read() and write() class methods to Imager::File::PNG, these are mostly intended for Imager::File::APNG, but are documented and usable elsewhere. - document in Imager::Install how to install Imager without any of the bundled-but-also-on-CPAN modules being installed. https://github.com/tonycoz/imager/issues/498 1.018 - skip trying to produce deprecation warnings before perl 5.14, since that doesn't support custom warning categories within a package. This prevents pointless failures on these old versions of perl. 1.017 Bug fix: - fix a one bytes underallocation for Imager::TrimColorList. On older perls this could lead to writing a zero byte one past the end of the allocated block. Documentation: - expand on why you might want to call Imager->preload() and that you probably don't need to. 1.016 Upcoming backward incompatible changes: - deprecate setting/deleting tags by code. If this causes you a problem please open an issue. You can disable the warning produced with: no warnings 'Imager::tagcodes'; - deprecate image channel masks. If this causes you a problem please open an issue. You can disable the warning produced with: no warnings 'Imager::channelmask'; If you use either of these features please let me know. Minor features: - add magic/extension support for AVIF files, see Imager::File::AVIF on CPAN. - treat an unknown extension of two or more characters as a potential file type on write. Bug fixes: - prevent a possible undefined value warning from t/t10jpeg.t - update MANIFEST.SKIPs, update MANIFESTs and improve MANIFEST testing. - TGA: failing to read in the palette of a paletted TGA file would leak memory. - JPEG: supplying invalid values for the new JPEG write tags could leak memory. - PNG: fix validation of Latin1 only tags when writing PNGs. (detected by clang) - matrix_transform: correctly use fabs() instead of abs() on floating point values when deciding whether to divide for a perspective transform. (detected by clang) - fix the i_poly_aa_cfill_m() API macro Cage cleaning: - eliminate IO::File usage from the Imager code base - fix a type error harmlessly ignored by gcc but found by clang - eliminate memory leaks in sub-module Makefile.PL probe test code to allow the probes to succeed under LeakSanitizer. - BMP: fix some otherwise harmless clang warnings - remove some code meant to work around some unspecified old Solaris linker bug. - i_noise: prevent a harmless conversion warning from clang - fountain fill/filter: limit ssample_param to 1000 to simplify code. 1.015 - rename the "virtual" member of i_img to "isvirtual" to allow the API to be used from C++, this may break source compatibility, using the i_img_virtual() accessor is backward compatible. - add cookbook entry to populating an image from raw RGB samples https://github.com/tonycoz/imager/issues/471 - Imager::Probe now puts the existing value of PKG_CONFIG_PATH at the front of the PKG_CONFIG_PATH used when it calls pkg-config. - setup CodeQL workflow and fix detected warnings JPEG updates: - detect libjpeg (of whichever variety) via pkg-config if possible - add specific support for mozjpeg (turn its optimization off by default so tests pass.) - add libjpeg_version(), is_mozjpeg(), is_turbojpeg() and has_arith_coding() methods - add jpeg_compress_profile output tag, which only matters for mozjpeg - the libjpeg_version() method replaces the old Imager::File::JPEG::i_libjpeg_version() function, and the format has changed. - various obscure jpeg output controls: - add support for JPEG arithmetic coding when the supplied libjpeg supports it. Note that not all JPEG decoders can handle arithmetic coded JPEGs. - add support for disabling the JFIF header for JPEG files using the jpeg_jfif tag. - add support for smoothing to eliminate dithering noise (like cjpeg -smooth) using the jpeg_smooth tag. - add support for producing JPEG restart markers (like cjpeg -restart N), using the jpeg_restart tag. - add control over subsample for JPEG (like the cjpeg -sample parameter) using the jpeg_sample tag - added tags for the rest of the MozJPEG API parameters. - add jpeg_tune tag, corresponding to the MozJPEG cjpeg -tune-* options. 1.014 Bug fixes: - fix failed to build on non-threaded perls. https://github.com/tonycoz/imager/issues/472 - when writing a paletted image with an alpha channel to PNG only set the tRNS chunk if the image has transparent colours. With older libpng this could add an erroneous tRNS chunk (or possibly undefined behaviour if I understand the libpng code). https://github.com/tonycoz/imager/issues/459 Features: - Imager::Color and Imager::Color::Float objects can now be created from CSS style rgb(...) strings. https://github.com/tonycoz/imager/issues/463 - added the as_css_rgb() method to both Imager::Color and Imager::Color::Float to format the supplied color as a CSS style rgb() string. https://github.com/tonycoz/imager/issues/463 - Imager::Color and Imager::Color::Float objects can now be created (copied) or set from other Imager::Color or Imager::Color::Float objects. 1.013 - added rgb_difference() method Thanks to Andreas König https://github.com/tonycoz/imager/pull/462 - update ppport.h to prevent a redefinition diagnostic - update bug tracker URLs to point at github https://github.com/tonycoz/imager/pull/466 - update some other bug tracker URLs too. - add the trim() and trim_rect() methods, to trim borders off an image. - add the as_float() method to Imager::Color and the as_8bit() method to Imager::Color::Float to convert between the two types. - update ppport.h to avoid a diagnostic in more modern perls. - add detection for HEIF, JPEG XL and QOI image formats
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d72f0b3cae70eccce206c7ece911bc073e240e02 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 08:02:38 2024 +0100
core191: ship libnetfilter_conntrack
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit c29ac3a8c0de48d75b78fcd49452bdfb8f3b02e9 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:39 2024 +0100
libnetfilter_conntrack: Update to version 1.1.0
- Update from version 1.0.9 to 1.1.0 - Update of rootfile not required - Changelog 1.1.0 - Enhancements for filtering dump and flush commands, see struct nfct_filter_dump and nfct_nlmsg_build_filter(). - ctnetlink event BPF fixes (endianness issue, IPv6 matching) and enhancements (zone matching). - fix for musl compilation.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0ba75db1c817040e70e504c4172a7a004ab0727d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 08:00:23 2024 +0100
core191: ship iptables
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d353dd36018227e7cdadb3b35b551dbd7b6ec69c Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:38 2024 +0100
iptables: Update to version 1.8.11
- Update from version 1.8.10 to 1.8.11 - Update of rootfile not required - Changelog 1.8.11 new features: - New arptables-translate tool - ebtables-nft: - Support for --change-counters command, albeit not atomic - Specify rule counters using iptables' '-c N,M' syntax - Support --replace and --list-rules commands - Support zeroing individual rules - Print negations (exclamation marks) extrapositioned (i.e., before the match they invert) for consistency with iptables - iptables-translate: - Align protocol name lookups with iptables - iptables-translate: Support socket match and TPROXY target - iptables-translate: Slightly improved avoidance of redundant 'ip protocol'/'meta l4proto' matches - iptables: - Undo numeric protocol printing of v1.8.9 for well-known protocols for consistency with iptables-save - Enable implicit extension lookup for dccp and ipcomp protocols (so no extra '-m <proto>' is needed after '-p <proto>') - iptables-save: Avoid calls to getprotobynumber() for consistency and improved performance with huge rule sets - libxtables: Support use of both xtables_ipaddr_to_numeric() and xtables_ipmask_to_numeric() as parameters to the same function call - configure: Support disabling use of libnfnetlink - Prefix xtables-monitor rule events by a typical command (iptables, ip6tables) instead of -4/-6 flags for consistency with ebtables and arptables events fixes: - arptables-nft: - Ineffective masks when specified in --h-type, --opcode and --proto-type matches - Wrong formatting of --h-type values and --proto-type masks causing misinterpretation by arptables-restore - iptables-nft: - Wrong error messages in corner-case error conditions - Zeroing single rule counters broken (again!) - Incorrect combination of inverted payload matches - Spurious error when zeroing a specific builtin chain which doesn't exist - Calling -Z command with bogus rule number must fail - libiptc: Corner-case segfault upon renaming a chain - ebtables-restore: - Corner-case bug with --noflush - Spurious failures when deleting multiple rules with among matches - ebtables-nft: - Different line number (--Ln) formatting than ebtables-legacy - Off-by-one rule number when using -S command with rule number - iptables-legacy: Broken --wait without timeout - libxtables: Leak of matches' udata buffer - Some matches stripped full value ranges from output even if inverted - Illegal memory access when parsing '-c ""' (i.e., empty string argument) - Inverted full interface wildcards (e.g. '! -i +') stripped from iptables-save output - xtables-monitor: - Incorrect output when not called with -4 or -6 options - Flush stdout after each line to prevent buffers and help with scripting - Align output for builtin chains with that of tables - Capture arptables chain events, too - Empty 'EVENT:' lines printed for ebtables rule changes - Fix for compiling against musl libc - xtables-translate: Fix translation of TPROXY target documentation updates: - Extensions: string: Starting with linux-6.7, pattern matching no longer extends past 'to' offset - update the man page accordingly - Extensions: recent: Clarify ip_list_hash_size default value and obsoleted state of ip_pkt_list_tot - ebtables-nft.8: Note that --concurrent is a NOP - Misc. typesetting, spelling and grammar fixes in man pages
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d3ce9e4fa3857f6f2b9e58d61fd65cb44d433b64 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:59:05 2024 +0100
core191: ship fuse
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 21eb8d54fd668be257b4774f9f13e54221f60ae9 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:37 2024 +0100
fuse: Update to version 3.16.2
- Update from version 3.15.0 to 3.16.2 - Update of rootfile not required - Changelog 3.16.2 Various small fixes and improvements. 3.16.1 Readdir kernel cache can be enabled from high-level API. 3.15.1 Future libfuse releases will be signed with `signify`_ rather than PGP (rationale_). This release is the last to be signed with PGP and contains the signify public key for current (3.15.X) and upcoming (3.16.X) minor release cycle.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit bb59f4627bb3ffd08c30088ae1a8e90ffb151567 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:57:39 2024 +0100
core191: fribidi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 5f722de57c2187c294b36e308293b265533ed6a6 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:36 2024 +0100
fribidi: Update to version 1.0.16
- Update from version 1.0.12 to 1.0.16 - Update of rootfile not required - Changelog 1.0.16 Update Unicode character databases to v16.0.0 1.0.15 Fixed the bad tarball from 1.0.14 with stall include files. There are no other changes 1.0.14 Updated Unicode tables to version 15.1 1.0.13 Adding missing man pages to the tar release file.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 86e3bdce09ed980228effcdf3fbb2c3297efa3e0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:55:08 2024 +0100
core191: ship freetype
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 29d13430cb961881e8dd6f25012f6838fdf3f9f8 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:35 2024 +0100
freetype: Update to version 2.13.3
- Update from version 2.13.2 to 2.13.3 - Update of rootfile - Changelog is too large to include here. For details see the contents of the file ChangeLog in the source tarball.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 937fab2cbb73aa8d399cc09340e5f426308ae139 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:53:53 2024 +0100
core191: ship elfutils
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0b4290554d7058246fb37aad8dd5afa8d85fb337 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:34 2024 +0100
elfutils: Update to version 0.192
- Update from version 0.191 to 0.192 - Update of rootfile - Changelog 0.192 CONDUCT: A new code of conduct has been adopted. See the CONDUCT file for more information. debuginfod: Add per-file signature verification for integrity checking, using RPM IMA scheme from Fedora/RHEL. New API for metadata queries: file name -> buildid. Server-side extraction of files from kernel debuginfo packages is significantly faster. Now takes < 0.25 seconds, down from ~50 seconds. libdw: New functions dwfl_set_sysroot, dwfl_frame_unwound_source and dwfl_unwound_source_str. stacktrace: Experimental new tool that can process a stream of stack samples from the Sysprof profiler and unwind them into call chains. Enable on x86 with --enable-stacktrace. See README.eu-stacktrace in the development branch for detailed usage instructions: https://sourceware.org/cgit/elfutils/tree/README.eu-stacktrace?h=users/serhe...
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f124c9c851d2d05d4847fef0d6181d62faa4afb1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:52:11 2024 +0100
core191: ship conntrack-tools
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 08634d5cd5e03b24dfbef5cc14abb5afa943e9b5 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:33 2024 +0100
conntrack-tools: Update to version 1.4.8
- Update from version 1.4.7 to 1.4.8 - Update of rootfile not required - Changelog 1.4.8 bugfixes: - fix spurious EOPNOSUPP and ENOBUFS errors with -U/--update command. - fix spurious ENOENT -D/--delete.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit aa51485a3aa461b6b29f47e11addbdeb79123b82 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:50:34 2024 +0100
core191: ship cairo
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 059cf647ad71359d904a284f048316a7df99f091 Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Nov 15 22:36:32 2024 +0100
cairo: Update to version 1.18.2
- Update from version 1.17.6 to 1.18.2 - Update of rootfile - Changelog 1.18.2 The malloc-stats code has been removed from the tests directory [#640]; the canonical location for it is: https://github.com/behdad/malloc-stats Cairo now requires a version of pixman equal to, or newer than, 0.40. [!522] There have been multiple build fixes for newer versions of GCC [!525, !542]; for MSVC [#808]; for Solaris [!540]; and on macOS 10.7 [#810]. PNG errors caused by loading malformed data are correctly propagated to callers, so they can handle the case. [!524] Both stroke and fill colors are now set when showing glyphs on a PDF surface. [#813] All the font options are copied when creating a fallback font object. [#819] When drawing text on macOS, Cairo now tries harder to select the appropriate font name. [#811] Cairo now prefers the COLRv1 table inside a font, if one is available. [!537] Cairo requires a C11 toolchain when building. [!479] 1.18.0 All the API added in the 1.17 development cycle is now considered stable, and will not change. Many thanks to all the contributors for this release. The cairo-sphinx tool has been removed; we could not find any instruction on how to use it, and no user answered our call for help. If you were using cairo-sphinx, please reach out to the cairo maintainers. Cairo now implements Type 3 color fonts for PDF. Thanks to Adrian Johnson for his work on this feature. Khaled Hosny contributed multiple documentation fixes, to ensure that the cairo API reference is up to date. Khaled also fixed multiple compiler warnings generated when building cairo. The XML surface has been removed; it was disabled by default when building cairo, and we could not find any downstream distributor that would enable it. The Tee surface is now automatically enabled. Downstream distributors of cairo have been enabling for years it in order to build Firefox. Fujii Hironori and Adrian Johnson fixed multiple issues with the DWrite font backend. John Ralls improved the Quartz surface; mainly, Quartz surfaces now use the main display ColorSpace, speeding up rendering operations. Cairo now hides all private symbols by default on every platform; the old "slim" symbols hack to alias internally used symbols has been dropped, in favor of using `-Bsymbolic-functions` with toolchains that support it. Uli Schlachter fixed multiple memory leaks in the code base and test suite, and helped with many reviews and general maintenance. Marc Jeanmougin added new API to expose the Pixman dithering filter to cairo patterns; this is currently implemented only for image surfaces. 1.17.8 In a continuing effort to reduce the amount of legacy code, and increase the long-term maintainability of cairo, the following backends have been removed: - GL and GLES drawing Additionally, cairo's Autotools build system has been removed; from now on, cairo will only support the Meson build system. While the end result should be identical, further testing is appreciated. In this snapshot, cairo gained support for rendering COLRv1 fonts, and rendering SVG and COLRv1 fonts with custom palettes. Support for macOS and Windows has been improved, with lots of build and bug fixes. Lots of safety issues have been fixed, with array bounds checking and plugging memory leaks, as well as fixes for bugs identified via fuzzying. This is going to be the last snapshot of the 1.17 development cycle; we only expect minor bug fixing and improvements until the 1.18.0 release.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8d8e4c1d0e5054a5dbe12ee24d6417cb3ffdda56 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:48:41 2024 +0100
core191: ship beep
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 53abba715072a7953bc223e81b7a1006e23bb216 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Nov 13 18:41:47 2024 +0100
beep: Update to version 1.4.12
- Update from version 1.3 (2010) to version 1.4.12 - The originator of beep released version 1.3 in 2010 but the last commit after that was in 2013. Since then nothing has happened. - Most of the patches used in IPFire with beep-1.3 were created by Hans Ulrich Niedermann and in 2019 he forked the original beep repository and has been doing updates since then. The last release was in 2022 and the last commit in April 2024. - This patch removes all the previous patches as they are built in to the current tarball. - Changelog 1.4.12 Document how to override and disable packaged udev rules. Changed the build system to be closer to the GNU makefile conventions, i.e. only one compiler/toolchain per build default installation is to prefix=/usr/local instead of prefix=/usr use GNU style docdir= instead of RPM spec file style pkgdocdir= etc. Still not using a configure script, though, as that is complex. The user writing a local.mk with some definitions covers everyone wanting to use the same settings across make invocations, though. 1.4.11 Install the contrib/morse/* scripts just like the failure-beeps. missed to be done in release 1.4.10 1.4.10 Rename CREDITS to CREDITS.md and CHANGELOG to NEWS.md and reformatted them to markdown. Fix some __VA_ARGS__ problems with some C language compiler options. contrib/morse/: Add both perl and tr+sed script options to have beep produce morse code by converting the output of the morse utility from the BSD Games package to a beep command line. If built without any drivers, running beep will now complain and abort instead of silently (pun intended) just not beeping. Stop using Travis CI. Use GitHub Actions workflows for CI instead. Skip test cases using PC speaker hardware if absent (e.g. on a VM) Improved documentation (e.g. alsamixer requirement, loading pcspkr) 1.4.9 Mention default values in the beep(1) man page and the beep --help output. 1.4.8 At build time, avoid error messages related to maybe building without git installed, or from a tarball instead of a git source tree. Improve issue-6-benchmark report to help people with solving issue #6. 1.4.7 Install contrib scripts for both successfully and failing sounding beeps as package documentation. Install man page uncompressed, so packagers can use their favoured compression format. 1.4.6 Use va_copy() macro in function with va_list parameter to avoid possible bug Use BEEP_LOG_LEVEL environment variable for default log level 1.4.4 Remove udev/rules.d/ and modprobe.d/ example files to force packagers to re-read PACKAGING.md and PERMISSIONS.md Rewritten PERMISSIONS.md and INSTALL.md, adapting README.md and PACKAGING.md and beep(1) (i.e. beep.1.in) for consistency Allow beep to run as non-root, even if SUDO_* env variables are present Fix newline escaping when generating beep-usage.c By default, use plain -g instead of -gstabs Ensure the gcc used actually supports the default flags in CFLAGS_gcc 1.4.3 Stop compiling with -fcf-protection in CFLAGS_gcc if the platform does not support it (such as the Raspberry Pi ARMs). 1.4.2 Improved beep(1) man page and --help output Cleaned signal handlers of all function calls Use beep driver infrastructure (console and evdev drivers) Abort on unhandled command line parameters Use nanosleep(2) instead of usleep(3) 1.4.1 Safer signal handlers (safe_error_exit() without global variables). Reduce accepted range of input numbers. 5 minute beeps should still be enough. 1.4.0 The beep-1.4.0 release tries to revive the beep software. There have been no commits to the former upstream since 2013, and with the two CVEs in 2018 that needed to change. Packagers beware: Please read PACKAGING.md for the very different (and much better) new way of device access. First and foremost, beep-1.4.0 fixes CVE-2018-0492 and CVE-2018-1000532. The beep command now by default tries /dev/input/by-path/platform-pcspkr-event-spkr which allows arbitrary users beep access by allowing those arbitrary users file write access. The procedures to do that are now well documented in INSTALL.md and PERMISSIONS.md. There is no need for setuid-root or sudo any more, and due to the experiences with the two 2018 CVEs, beep will even refuse to run when it detects being run setuid or via sudo. A few smaller things have also been changed. Quoting the CHANGELOG: Fix CVE-2018-1000532 External Control of File Name or Path vulnerability in --device option Fix CVE-2018-0492 race condition that allows local privilege escalation Make /dev/input/by-path/platform-pcspkr-event-spkr the default device to use as the system administrator can allow access to that without needing any priviledge escalation risks via setuid or sudo. Adapt --help output, beep.1 man page, README.md, INSTALL.md to reflect the new device use. Add basic suite of tests. Constrained a few integers to avoid integer overflows. Only issue fallback '\a' type beeps if that '\a' actually goes to a tty device which can actually beep Stop promoting floating point frequencies which no Kernel API can even use
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Tested-by: Adolf Belka adolf.belka@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 80ea76fdeeee6d9c45ac5aa660f977e894f959e8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 12 07:47:01 2024 +0100
core191: ship bridge-utils
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d0f1df71258b6337371c8f06d2217bd65a1fa307 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Nov 13 15:10:47 2024 +0100
bridge-utils: Update to version 1.7.1
- Update from version 1.5 (2011) to 1.7.1 (2021) - bridge-utils has been marked as deprecated in June 2020 and that only critical bug fixes will be applied in future. Since that time there have been three commits in the git repository, none of which are critical at all but mostly cleaning up. The last commit was in January 2022. - Even though no new changes are planned it makes sense to update this package from the 2011 version to the 2021 version. - The patch that was previously used is no longer needed as it is now built into the source tarball. - Rootfile update not required. - Changelog was last updated in 2006. It looks like the only source for changes is the git commits. There are 28 commits between version 1.5 and 1.7.1 https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/log/?h=main
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/beep | 12 +++ config/rootfiles/common/cairo | 13 ++- config/rootfiles/common/elfutils | 50 ++++++++- config/rootfiles/common/freetype | 2 +- config/rootfiles/common/libidn2 | 7 ++ config/rootfiles/common/perl-Imager | 2 + .../{oldcore/121 => core/191}/filelists/beep | 0 .../66 => core/191}/filelists/bridge-utils | 0 .../{oldcore/110 => core/191}/filelists/cairo | 0 .../110 => core/191}/filelists/conntrack-tools | 0 .../{oldcore/185 => core/191}/filelists/elfutils | 0 .../{oldcore/141 => core/191}/filelists/elinks | 0 .../{oldcore/110 => core/191}/filelists/freetype | 0 .../{oldcore/163 => core/191}/filelists/fribidi | 0 .../{oldcore/112 => core/191}/filelists/fuse | 0 .../{oldcore/123 => core/191}/filelists/iptables | 0 config/rootfiles/core/191/filelists/libidn2 | 1 + .../191}/filelists/libnetfilter_conntrack | 0 .../169 => core/191}/filelists/perl-Imager | 0 lfs/beep | 19 +--- lfs/bridge-utils | 11 +- lfs/cairo | 12 +-- lfs/conntrack-tools | 8 +- lfs/elfutils | 4 +- lfs/elinks | 18 ++-- lfs/freetype | 6 +- lfs/fribidi | 10 +- lfs/fuse | 5 +- lfs/iptables | 6 +- lfs/{libsodium => libidn2} | 12 +-- lfs/libnetfilter_conntrack | 8 +- lfs/perl-Imager | 7 +- make.sh | 1 + src/patches/beep/0001-Fixed-Makefile.patch | 44 -------- .../beep/0002-Add-more-error-detection.patch | 44 -------- ...-also-catch-SIGTERM-for-stopping-the-beep.patch | 32 ------ ...-install-more-user-and-packaging-friendly.patch | 85 --------------- ...reserve-file-modification-time-on-install.patch | 32 ------ .../beep/0007-Fix-identation-if-brace-error.patch | 41 -------- ...8-Apply-CVE-2018-0492-from-Debian-package.patch | 117 --------------------- src/patches/bridge-utils-1.5-compile-fix-1.patch | 31 ------ ...lude-t1tables.h-for-FT_Has_PS_Glyph_Names.patch | 32 ++++++ 42 files changed, 171 insertions(+), 501 deletions(-) create mode 100644 config/rootfiles/common/libidn2 copy config/rootfiles/{oldcore/121 => core/191}/filelists/beep (100%) copy config/rootfiles/{oldcore/66 => core/191}/filelists/bridge-utils (100%) copy config/rootfiles/{oldcore/110 => core/191}/filelists/cairo (100%) copy config/rootfiles/{oldcore/110 => core/191}/filelists/conntrack-tools (100%) copy config/rootfiles/{oldcore/185 => core/191}/filelists/elfutils (100%) copy config/rootfiles/{oldcore/141 => core/191}/filelists/elinks (100%) copy config/rootfiles/{oldcore/110 => core/191}/filelists/freetype (100%) copy config/rootfiles/{oldcore/163 => core/191}/filelists/fribidi (100%) copy config/rootfiles/{oldcore/112 => core/191}/filelists/fuse (100%) copy config/rootfiles/{oldcore/123 => core/191}/filelists/iptables (100%) create mode 120000 config/rootfiles/core/191/filelists/libidn2 copy config/rootfiles/{oldcore/106 => core/191}/filelists/libnetfilter_conntrack (100%) copy config/rootfiles/{oldcore/169 => core/191}/filelists/perl-Imager (100%) copy lfs/{libsodium => libidn2} (92%) delete mode 100644 src/patches/beep/0001-Fixed-Makefile.patch delete mode 100644 src/patches/beep/0002-Add-more-error-detection.patch delete mode 100644 src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch delete mode 100644 src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch delete mode 100644 src/patches/beep/0006-Preserve-file-modification-time-on-install.patch delete mode 100644 src/patches/beep/0007-Fix-identation-if-brace-error.patch delete mode 100644 src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch delete mode 100644 src/patches/bridge-utils-1.5-compile-fix-1.patch create mode 100644 src/patches/perl-Imager-1.024-include-t1tables.h-for-FT_Has_PS_Glyph_Names.patch
Difference in files: diff --git a/config/rootfiles/common/beep b/config/rootfiles/common/beep index a47db27675..d20101cd23 100644 --- a/config/rootfiles/common/beep +++ b/config/rootfiles/common/beep @@ -1 +1,13 @@ usr/bin/beep +#usr/share/doc/beep +#usr/share/doc/beep/COPYING +#usr/share/doc/beep/CREDITS.md +#usr/share/doc/beep/NEWS.md +#usr/share/doc/beep/PERMISSIONS.md +#usr/share/doc/beep/README.md +#usr/share/doc/beep/contrib +#usr/share/doc/beep/contrib/failure-beeps +#usr/share/doc/beep/contrib/morse2beep.pl +#usr/share/doc/beep/contrib/morse2beep.sed +#usr/share/doc/beep/contrib/success-beeps +#usr/share/man/man1/beep.1 diff --git a/config/rootfiles/common/cairo b/config/rootfiles/common/cairo index c83ed107cb..2e4474607f 100644 --- a/config/rootfiles/common/cairo +++ b/config/rootfiles/common/cairo @@ -9,23 +9,21 @@ #usr/include/cairo/cairo-script-interpreter.h #usr/include/cairo/cairo-script.h #usr/include/cairo/cairo-svg.h +#usr/include/cairo/cairo-tee.h #usr/include/cairo/cairo-version.h #usr/include/cairo/cairo.h #usr/lib/cairo -#usr/lib/cairo/libcairo-trace.la +#usr/lib/cairo/libcairo-fdr.so #usr/lib/cairo/libcairo-trace.so -#usr/lib/libcairo-gobject.la #usr/lib/libcairo-gobject.so usr/lib/libcairo-gobject.so.2 -usr/lib/libcairo-gobject.so.2.11706.0 -#usr/lib/libcairo-script-interpreter.la +usr/lib/libcairo-gobject.so.2.11802.2 #usr/lib/libcairo-script-interpreter.so usr/lib/libcairo-script-interpreter.so.2 -usr/lib/libcairo-script-interpreter.so.2.11706.0 -#usr/lib/libcairo.la +usr/lib/libcairo-script-interpreter.so.2.11802.2 #usr/lib/libcairo.so usr/lib/libcairo.so.2 -usr/lib/libcairo.so.2.11706.0 +usr/lib/libcairo.so.2.11802.2 #usr/lib/pkgconfig/cairo-fc.pc #usr/lib/pkgconfig/cairo-ft.pc #usr/lib/pkgconfig/cairo-gobject.pc @@ -35,4 +33,5 @@ usr/lib/libcairo.so.2.11706.0 #usr/lib/pkgconfig/cairo-script-interpreter.pc #usr/lib/pkgconfig/cairo-script.pc #usr/lib/pkgconfig/cairo-svg.pc +#usr/lib/pkgconfig/cairo-tee.pc #usr/lib/pkgconfig/cairo.pc diff --git a/config/rootfiles/common/elfutils b/config/rootfiles/common/elfutils index 04773db9f4..33d8dbf937 100644 --- a/config/rootfiles/common/elfutils +++ b/config/rootfiles/common/elfutils @@ -28,15 +28,15 @@ #usr/include/gelf.h #usr/include/libelf.h #usr/include/nlist.h -usr/lib/libasm-0.191.so +usr/lib/libasm-0.192.so #usr/lib/libasm.a #usr/lib/libasm.so usr/lib/libasm.so.1 -usr/lib/libdw-0.191.so +usr/lib/libdw-0.192.so #usr/lib/libdw.a #usr/lib/libdw.so usr/lib/libdw.so.1 -usr/lib/libelf-0.191.so +usr/lib/libelf-0.192.so #usr/lib/libelf.a #usr/lib/libelf.so usr/lib/libelf.so.1 @@ -49,10 +49,54 @@ usr/lib/libelf.so.1 #usr/share/locale/ja/LC_MESSAGES/elfutils.mo #usr/share/locale/pl/LC_MESSAGES/elfutils.mo #usr/share/locale/uk/LC_MESSAGES/elfutils.mo +#usr/share/man/man1/debuginfod-find.1 #usr/share/man/man1/eu-elfclassify.1 #usr/share/man/man1/eu-readelf.1 #usr/share/man/man1/eu-srcfiles.1 +#usr/share/man/man3/debuginfod_add_http_header.3 +#usr/share/man/man3/debuginfod_begin.3 +#usr/share/man/man3/debuginfod_end.3 +#usr/share/man/man3/debuginfod_find_debuginfo.3 +#usr/share/man/man3/debuginfod_find_executable.3 +#usr/share/man/man3/debuginfod_find_metadata.3 +#usr/share/man/man3/debuginfod_find_section.3 +#usr/share/man/man3/debuginfod_find_source.3 +#usr/share/man/man3/debuginfod_get_url.3 +#usr/share/man/man3/debuginfod_get_user_data.3 +#usr/share/man/man3/debuginfod_set_progressfn.3 +#usr/share/man/man3/debuginfod_set_user_data.3 +#usr/share/man/man3/elf32_checksum.3 +#usr/share/man/man3/elf32_fsize.3 +#usr/share/man/man3/elf32_getchdr.3 +#usr/share/man/man3/elf32_getehdr.3 +#usr/share/man/man3/elf32_getphdr.3 +#usr/share/man/man3/elf32_getshdr.3 +#usr/share/man/man3/elf32_newehdr.3 +#usr/share/man/man3/elf32_newphdr.3 +#usr/share/man/man3/elf32_offscn.3 +#usr/share/man/man3/elf32_xlatetof.3 +#usr/share/man/man3/elf32_xlatetom.3 +#usr/share/man/man3/elf64_checksum.3 +#usr/share/man/man3/elf64_fsize.3 +#usr/share/man/man3/elf64_getchdr.3 +#usr/share/man/man3/elf64_getehdr.3 +#usr/share/man/man3/elf64_getphdr.3 +#usr/share/man/man3/elf64_getshdr.3 +#usr/share/man/man3/elf64_newehdr.3 +#usr/share/man/man3/elf64_newphdr.3 +#usr/share/man/man3/elf64_offscn.3 +#usr/share/man/man3/elf64_xlatetof.3 +#usr/share/man/man3/elf64_xlatetom.3 #usr/share/man/man3/elf_begin.3 #usr/share/man/man3/elf_clone.3 +#usr/share/man/man3/elf_errmsg.3 +#usr/share/man/man3/elf_errno.3 #usr/share/man/man3/elf_getdata.3 +#usr/share/man/man3/elf_getscn.3 +#usr/share/man/man3/elf_ndxscn.3 #usr/share/man/man3/elf_update.3 +#usr/share/man/man3/elf_version.3 +#usr/share/man/man3/libelf.3 +#usr/share/man/man7/debuginfod-client-config.7 +#usr/share/man/man8/debuginfod.8 +#usr/share/man/man8/debuginfod.service.8 diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype index b83b26afcb..81adc2503b 100644 --- a/config/rootfiles/common/freetype +++ b/config/rootfiles/common/freetype @@ -60,7 +60,7 @@ #usr/lib/libfreetype.la #usr/lib/libfreetype.so usr/lib/libfreetype.so.6 -usr/lib/libfreetype.so.6.20.1 +usr/lib/libfreetype.so.6.20.2 #usr/lib/pkgconfig/freetype2.pc #usr/share/aclocal/freetype2.m4 #usr/share/man/man1/freetype-config.1 diff --git a/config/rootfiles/common/libidn2 b/config/rootfiles/common/libidn2 new file mode 100644 index 0000000000..45a4c84ea1 --- /dev/null +++ b/config/rootfiles/common/libidn2 @@ -0,0 +1,7 @@ +usr/bin/idn2 +#usr/include/idn2.h +#usr/lib/libidn2.la +#usr/lib/libidn2.so +usr/lib/libidn2.so.0 +usr/lib/libidn2.so.0.4.0 +#usr/lib/pkgconfig/libidn2.pc diff --git a/config/rootfiles/common/perl-Imager b/config/rootfiles/common/perl-Imager index 6886d46adc..5674f7b524 100644 --- a/config/rootfiles/common/perl-Imager +++ b/config/rootfiles/common/perl-Imager @@ -54,6 +54,7 @@ usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/Test.pm usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/Threads.pod usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/Transform.pm usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/Transformations.pod +usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/TrimColorList.pm usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/Tutorial.pod #usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/include #usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Imager/include/draw.h @@ -160,6 +161,7 @@ usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Imager/Imag #usr/share/man/man3/Imager::Threads.3 #usr/share/man/man3/Imager::Transform.3 #usr/share/man/man3/Imager::Transformations.3 +#usr/share/man/man3/Imager::TrimColorList.3 #usr/share/man/man3/Imager::Tutorial.3 #usr/share/man/man3/Imager::interface.3 #usr/share/man/man3/Imager::regmach.3 diff --git a/config/rootfiles/core/191/filelists/beep b/config/rootfiles/core/191/filelists/beep new file mode 120000 index 0000000000..6db094efa7 --- /dev/null +++ b/config/rootfiles/core/191/filelists/beep @@ -0,0 +1 @@ +../../../common/beep \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/bridge-utils b/config/rootfiles/core/191/filelists/bridge-utils new file mode 120000 index 0000000000..3dee211b6b --- /dev/null +++ b/config/rootfiles/core/191/filelists/bridge-utils @@ -0,0 +1 @@ +../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/cairo b/config/rootfiles/core/191/filelists/cairo new file mode 120000 index 0000000000..bf48d25a41 --- /dev/null +++ b/config/rootfiles/core/191/filelists/cairo @@ -0,0 +1 @@ +../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/conntrack-tools b/config/rootfiles/core/191/filelists/conntrack-tools new file mode 120000 index 0000000000..88fbe061e8 --- /dev/null +++ b/config/rootfiles/core/191/filelists/conntrack-tools @@ -0,0 +1 @@ +../../../common/conntrack-tools \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/elfutils b/config/rootfiles/core/191/filelists/elfutils new file mode 120000 index 0000000000..8367974bbc --- /dev/null +++ b/config/rootfiles/core/191/filelists/elfutils @@ -0,0 +1 @@ +../../../common/elfutils \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/elinks b/config/rootfiles/core/191/filelists/elinks new file mode 120000 index 0000000000..10db4dd8f7 --- /dev/null +++ b/config/rootfiles/core/191/filelists/elinks @@ -0,0 +1 @@ +../../../common/elinks \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/freetype b/config/rootfiles/core/191/filelists/freetype new file mode 120000 index 0000000000..79ec5c42e4 --- /dev/null +++ b/config/rootfiles/core/191/filelists/freetype @@ -0,0 +1 @@ +../../../common/freetype \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/fribidi b/config/rootfiles/core/191/filelists/fribidi new file mode 120000 index 0000000000..1a17a37c9a --- /dev/null +++ b/config/rootfiles/core/191/filelists/fribidi @@ -0,0 +1 @@ +../../../common/fribidi \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/fuse b/config/rootfiles/core/191/filelists/fuse new file mode 120000 index 0000000000..570edaadef --- /dev/null +++ b/config/rootfiles/core/191/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/iptables b/config/rootfiles/core/191/filelists/iptables new file mode 120000 index 0000000000..8caf12bccb --- /dev/null +++ b/config/rootfiles/core/191/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/libidn2 b/config/rootfiles/core/191/filelists/libidn2 new file mode 120000 index 0000000000..14a17fa232 --- /dev/null +++ b/config/rootfiles/core/191/filelists/libidn2 @@ -0,0 +1 @@ +../../../common/libidn2 \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/libnetfilter_conntrack b/config/rootfiles/core/191/filelists/libnetfilter_conntrack new file mode 120000 index 0000000000..6ef5cc4392 --- /dev/null +++ b/config/rootfiles/core/191/filelists/libnetfilter_conntrack @@ -0,0 +1 @@ +../../../common/libnetfilter_conntrack \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/perl-Imager b/config/rootfiles/core/191/filelists/perl-Imager new file mode 120000 index 0000000000..380cf519e8 --- /dev/null +++ b/config/rootfiles/core/191/filelists/perl-Imager @@ -0,0 +1 @@ +../../../common/perl-Imager \ No newline at end of file diff --git a/lfs/beep b/lfs/beep index 8ab9774abb..6c3d501092 100644 --- a/lfs/beep +++ b/lfs/beep @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.3 +VER = 1.4.12
THISAPP = beep-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 +$(DL_FILE)_BLAKE2 = 06f21cf3c40389acca50e6e420af4e738b7484e096bb689345fedb37684b15733dbb38e8a5d0d360f23e020cebe9ba321984ee43f41b0ad980648414ddbb9375
install : $(TARGET)
@@ -70,16 +70,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 -i $(DIR_SRC)/src/patches/beep/0001-Fixed-Makefile.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0002-Add-more-error-detection.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0007-Fix-identation-if-brace-error.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch - - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && install -m 0755 beep /usr/bin + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) prefix=/usr + cd $(DIR_APP) && make prefix=/usr install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/bridge-utils b/lfs/bridge-utils index f1170d7aae..b67b848503 100644 --- a/lfs/bridge-utils +++ b/lfs/bridge-utils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.5 +VER = 1.7.1
THISAPP = bridge-utils-$(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 = 211ecb831f802c119f32c30621daa781056bd9ff2fb5880d328704bd76b5b5b964d0671f77489fb9c71f25a3e073e5e4070cfa759deeba014aa1136ff60b1fdd +$(DL_FILE)_BLAKE2 = 36b8b9c62e88f6f1510acbf23ab8dc5ec41d3bf97eecd274c91771e116650e30b366ded37e65bde061c1e9bc7b19b7eae1e17d4573fcea9fd31892bf6d937515
install : $(TARGET)
@@ -69,8 +69,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/bridge-utils-1.5-compile-fix-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && find . -name Makefile.in | xargs sed -i -e "s/^KERNEL_HEADERS/#&/g" cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr diff --git a/lfs/cairo b/lfs/cairo index 30744b3d76..b15c665e4f 100644 --- a/lfs/cairo +++ b/lfs/cairo @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.17.6 +VER = 1.18.2
THISAPP = cairo-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +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 = 05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724 +$(DL_FILE)_BLAKE2 = 6046ebc96bf79ef4fcff476d998cee756b0132198c129b049101ab7a70fe420b37f0f0b3ff90c51188005a19b87cb9dabe451bd97679d75ef397f0b3feb2af14
install : $(TARGET)
@@ -70,8 +70,8 @@ $(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) && meson \ - --prefix=/usr \ + cd $(DIR_APP) && meson setup \ + --prefix=/usr \ builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install diff --git a/lfs/conntrack-tools b/lfs/conntrack-tools index 2296c7ca80..65f8b02b75 100644 --- a/lfs/conntrack-tools +++ b/lfs/conntrack-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.4.7 +VER = 1.4.8
THISAPP = conntrack-tools-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 42a3cacf8a32a5b8b688a9fd68f66024c591e9814ef3cc349456691094bab0fae15bb1c00befa178b0f8e845bf6fc00715cbf9db55cd7bf2d155c2dfd55f9b1a +$(DL_FILE)_BLAKE2 = 2f8a7d7facf4890a8ca7dec54d5faa1383ad5e449a0599707578567e9c8ed6fd63ca308538afc34e99121e39e80c1ce686c8dda89247abdf4699bb420b52c4fb
install : $(TARGET)
diff --git a/lfs/elfutils b/lfs/elfutils index 901b82d42e..a9f487f1b9 100644 --- a/lfs/elfutils +++ b/lfs/elfutils @@ -26,7 +26,7 @@ include Config
SUMMARY = Higher-level library to access ELF files
-VER = 0.191 +VER = 0.192
THISAPP = elfutils-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 2a7ad251369eca7ba609ab8644181fd479ad8596ee58dc068398ca22be25a978e96b81a10a92a5555d7574fd1b9227c8d54fb41dceb4025aedfc6ae32870bbca +$(DL_FILE)_BLAKE2 = cf9036a1fca416e0d47c76471093609230545aee63e31e30991dc3c88417d7c621c930bb74809374da3bf142501cee91a2b861a5a89efcb5e1ac184df5defce1
install : $(TARGET)
diff --git a/lfs/elinks b/lfs/elinks index c4b121d6a7..bf76343a1c 100644 --- a/lfs/elinks +++ b/lfs/elinks @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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,7 +26,7 @@ include Config
SUMMARY = An advanced and well-established feature-rich text mode web browser
-VER = 0.16.0 +VER = 0.17.1.1
THISAPP = elinks-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b81dfeb303d2e33c88f063925f61dbf50a1cf8462cf3d000b70e01b210855682352303646c7d4dc2c5bdd0de41c3ce33d222c636be4d8292cbe8379b4b043ef8 +$(DL_FILE)_BLAKE2 = 2158e7630e64977b5250d544159bff0b90953ef7d51870d5e96ce8e36858596e6341bf774ad1717ed4808859d4be316fe75587552e61a8bbfcb00a0366a85e81
install : $(TARGET)
@@ -72,11 +72,13 @@ $(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) && meson \ - --prefix=/usr/local \ - -D tre=false \ - -D gpm=false \ - builddir/ + cd $(DIR_APP) && meson setup \ + --prefix=/usr/local \ + -D tre=false \ + -D gpm=false \ + -D libcss=false \ + -D doc=false \ + builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && ninja -C builddir/ install
diff --git a/lfs/freetype b/lfs/freetype index 7210d6c8a8..fa69e4e31c 100644 --- a/lfs/freetype +++ b/lfs/freetype @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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 = 2.13.2 +VER = 2.13.3
THISAPP = freetype-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = cebc82180d9afaeb112a65ba78903d7bf7a9295a803166a033585ad2325add6023f05066852240c4665e56285345ba503b01ecd461d48f0478a8f3f56136988e +$(DL_FILE)_BLAKE2 = f9591c6998df02b072adaf38a968e91deae8ed4d53ea0cb74d08982c4f0e48b1a98c1378a698164e4f730f07a3b0bea308a94fcc2e2b8ce9967dbf9478b599bd
install : $(TARGET)
diff --git a/lfs/fribidi b/lfs/fribidi index 75ea2d1486..9e32b79d71 100644 --- a/lfs/fribidi +++ b/lfs/fribidi @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.0.12 +VER = 1.0.16
THISAPP = fribidi-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5 +$(DL_FILE)_BLAKE2 = 9a0dce6152ba0f0ca4a42a83ca0f6d234fb9fef2a681d274aab6922e3394b70430e677fd549b17b13d928d733c0e72a7e3527cfb461971bbfd155ec1bd5e738c
install : $(TARGET)
@@ -71,7 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && meson --prefix=/usr builddir/ + cd $(DIR_APP) && meson setup \ + --prefix=/usr \ + builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) diff --git a/lfs/fuse b/lfs/fuse index ae225e83c5..c275904b6e 100644 --- a/lfs/fuse +++ b/lfs/fuse @@ -73,7 +73,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) && meson --prefix=/usr -Dexamples=false builddir + cd $(DIR_APP) && meson setup \ + --prefix=/usr \ + -D examples=false \ + builddir/ cd $(DIR_APP)/builddir && ninja $(MAKETUNING) cd $(DIR_APP)/builddir && ninja install
diff --git a/lfs/iptables b/lfs/iptables index 572d9f2122..e8c4069d6e 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.8.10 +VER = 1.8.11
THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -41,7 +41,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) netfilter-layer7-v2.23.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.23.tar.gz
-$(DL_FILE)_BLAKE2 = 417b33fcfc7edeba169caef26ed0322798f6b82500840509f6c10b97b4ef3f11932c0393fc8dcc5946264442bf8ee959a594b6fbd5dc92012cfad30edf130520 +$(DL_FILE)_BLAKE2 = 82daca3940e253f6fda7cf5b3332488c31391ff66c0112c0cae2645ab61918f81e6028ea2b1e1385f21e4c5ff8cd64cba31072a2417a2ab696fe1c6b5464cea1 netfilter-layer7-v2.23.tar.gz_BLAKE2 = 5c8ab722f6fbc126f2f65ecf401de5fc40560c20e3be52f783db34410446185dcb6781b3148e4a174e8b2d2c290bec0342dea95e8cefc35c39345617fa7a8fdc
install : $(TARGET) diff --git a/lfs/libidn2 b/lfs/libidn2 new file mode 100644 index 0000000000..b0e51e1e97 --- /dev/null +++ b/lfs/libidn2 @@ -0,0 +1,82 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3.7 + +THISAPP = libidn2-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 40fde88e6be1e4665738855608a65c949834728463a3fb466192403f1076e99f7d399b9631308ff6776a28915251a0136ddfe6a67e8e010c7ccdb7fc64125d39 + + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-nls \ + --disable-doc \ + --disable-static + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack index 3141606fec..8d724e4e94 100644 --- a/lfs/libnetfilter_conntrack +++ b/lfs/libnetfilter_conntrack @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 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.0.9 +VER = 1.1.0
THISAPP = libnetfilter_conntrack-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +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 = 701393338a0bf852b97d80a1e4ab078dea741f7181246b3dafcbe8cff287b5b9fae72c1c50867ea71baab83fa842471b2c7054fb4702bf35900a352078de8f3a +$(DL_FILE)_BLAKE2 = e1f8342b4edcbd81ab9995c9ac37818006c710f890b85120e5225936163d8ac24b5a487b468cb9f98cf3c86ab3534e1a9fc866b06633c82eb9bd81d0caf2ffa1
install : $(TARGET)
diff --git a/lfs/perl-Imager b/lfs/perl-Imager index e7301b92b9..445e18c0b8 100644 --- a/lfs/perl-Imager +++ b/lfs/perl-Imager @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2022 IPFire Team info@ipfire.org # +# Copyright (C) 2022-2024 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.012 +VER = 1.024
THISAPP = Imager-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 32dad83e9cfd66a162380b502ab49b343dae8c87eca8e6c0537d260956bf466e200511a7b4f89eed9b0bc1f20447584c7c4aabffaad77f0824ee9d5126848c39 +$(DL_FILE)_BLAKE2 = 3bbb7bc5a0537ca8095141e5aeca4dc27cc5f5bf94278a9538cef24a6013e16c5ff273035e589be113070db72afc2b19194d2bd2ce17937758e1748dd51ff56d
install : $(TARGET)
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && yes 'n' | perl Makefile.PL + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/perl-Imager-1.024-include-t1tables.h-for-FT_Has_PS_Glyph_Names.patch cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index bdf3f51234..a681d7ee04 100755 --- a/make.sh +++ b/make.sh @@ -1659,6 +1659,7 @@ build_system() { lfsmake2 libnet lfsmake2 libnl-3 lfsmake2 libidn + lfsmake2 libidn2 lfsmake2 nasm lfsmake2 libjpeg lfsmake2 openjpeg diff --git a/src/patches/beep/0001-Fixed-Makefile.patch b/src/patches/beep/0001-Fixed-Makefile.patch deleted file mode 100644 index 6b35ab0a9b..0000000000 --- a/src/patches/beep/0001-Fixed-Makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 8b32b8b088be1f29e8bfea57a97b9bfaa76ec8ee Mon Sep 17 00:00:00 2001 -From: Chris Wong chrisyco@gmail.com -Date: Wed, 23 Nov 2011 10:39:53 +1300 -Subject: [PATCH] Fixed Makefile - -* Use /usr/share/man (see http://www.pathname.com/fhs/2.2/fhs-4.11.html#4.11.5) - -* Removed trailing spaces - -* Added optimization flag (must beep FAST!!!) ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index cc359c4..0f4f810 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,19 +1,19 @@ - CC=gcc --FLAGS=-Wall -+FLAGS=-Wall -O2 - EXEC_NAME=beep - INSTALL_DIR=/usr/bin - MAN_FILE=beep.1.gz --MAN_DIR=/usr/man/man1 -+MAN_DIR=/usr/share/man/man1 - - default : beep - --clean : -+clean : - rm ${EXEC_NAME} - - beep : beep.c - ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c - --install : -+install : - cp ${EXEC_NAME} ${INSTALL_DIR} - # rm -f /usr/man/man1/beep.1.bz2 - cp ${MAN_FILE} ${MAN_DIR} --- -2.7.5 diff --git a/src/patches/beep/0002-Add-more-error-detection.patch b/src/patches/beep/0002-Add-more-error-detection.patch deleted file mode 100644 index 733af9b15f..0000000000 --- a/src/patches/beep/0002-Add-more-error-detection.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d3aee6c489852108c91dc22abcacff364e9429f2 Mon Sep 17 00:00:00 2001 -From: Chris Wong chrisyco@gmail.com -Date: Wed, 23 Nov 2011 11:34:55 +1300 -Subject: [PATCH] Add more error detection - ---- - beep.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/beep.c b/beep.c -index 452fc08..14fac3e 100644 ---- a/beep.c -+++ b/beep.c -@@ -98,11 +98,11 @@ char *console_device = NULL; - - - void do_beep(int freq) { -- if (console_type == BEEP_TYPE_CONSOLE) { -- if(ioctl(console_fd, KIOCSOUND, freq != 0 -- ? (int)(CLOCK_TICK_RATE/freq) -- : freq) < 0) { -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ int period = (freq != 0 ? (int)(CLOCK_TICK_RATE/freq) : freq); -+ -+ if(console_type == BEEP_TYPE_CONSOLE) { -+ if(ioctl(console_fd, KIOCSOUND, period) < 0) { -+ putchar('\a'); /* Output the only beep we can, in an effort to fall back on usefulness */ - perror("ioctl"); - } - } else { -@@ -113,7 +113,10 @@ void do_beep(int freq) { - e.code = SND_TONE; - e.value = freq; - -- write(console_fd, &e, sizeof(struct input_event)); -+ if(write(console_fd, &e, sizeof(struct input_event)) < 0) { -+ putchar('\a'); /* See above */ -+ perror("write"); -+ } - } - } - --- -2.7.5 diff --git a/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch b/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch deleted file mode 100644 index c11061e6a2..0000000000 --- a/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e1320c1da52ca92aa68b4224f9532982184fbe00 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=B4me?= jerome@jolimont.fr -Date: Thu, 7 Feb 2013 12:54:53 +0100 -Subject: [PATCH] also catch SIGTERM for stopping the beep - -Signed-off-by: Gerfried Fuchs rhonda@deb.at ---- - beep.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/beep.c b/beep.c -index 452fc08..9cb63bf 100644 ---- a/beep.c -+++ b/beep.c -@@ -130,6 +130,7 @@ void handle_signal(int signum) { - - switch(signum) { - case SIGINT: -+ case SIGTERM: - if(console_fd >= 0) { - /* Kill the sound, quit gracefully */ - do_beep(0); -@@ -324,6 +325,7 @@ int main(int argc, char **argv) { - parms->next = NULL; - - signal(SIGINT, handle_signal); -+ signal(SIGTERM, handle_signal); - parse_command_line(argc, argv, parms); - - /* this outermost while loop handles the possibility that -n/--new has been --- -2.7.5 diff --git a/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch b/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch deleted file mode 100644 index 9e2b481b31..0000000000 --- a/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 947a7e332908dcba1c7e523fbdc927d39ee6adb1 Mon Sep 17 00:00:00 2001 -From: Hans Ulrich Niedermann hun@n-dimensional.de -Date: Tue, 19 Nov 2013 23:40:50 +0100 -Subject: [PATCH] Make build/install more user and packaging friendly - -Make the build and install more user and packaging friendly -by introducing the following features in the Makefile: - - * Honor the $(CFLAGS) set when calling make. - - * Prefix all install locations with $(DESTDIR) for - easy package building. - - * Use GNU Makefile conventions for defining installation - directories. This means $(bindir) and $(man1dir) - instead of the former $(INSTALL_DIR) and $(MAN_DIR). - - * Use install(1) for installing files and directories - so that permissions can be set properly. - - * Stop "make clean" failing when it has nothing to do. - - * Add 'uninstall' make target. - - * Make 'install' target build executable if necessary. ---- - Makefile | 40 +++++++++++++++++++++++++++++----------- - 1 file changed, 29 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index 0f4f810..942a7a5 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,19 +1,37 @@ - CC=gcc - FLAGS=-Wall -O2 -+ -+INSTALL=install -+ - EXEC_NAME=beep --INSTALL_DIR=/usr/bin - MAN_FILE=beep.1.gz --MAN_DIR=/usr/share/man/man1 - --default : beep -+# Use GNU makefile conventions for directory names with one notable -+# exception: prefix is not /usr/local in order to keep the default -+# installation location for beep. -+prefix=/usr -+exec_prefix=$(prefix) -+bindir=$(exec_prefix)/bin -+datarootdir=$(prefix)/share -+mandir=$(datarootdir)/man -+man1dir=$(mandir)/man1 -+ -+.PHONY: all -+all: $(EXEC_NAME) -+ -+.PHONY: clean -+clean: -+ rm -f $(EXEC_NAME) - --clean : -- rm ${EXEC_NAME} -+$(EXEC_NAME): beep.c -+ $(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) beep.c - --beep : beep.c -- ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c -+install: all -+ $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) -+ $(INSTALL) -m 0755 $(EXEC_NAME) $(DESTDIR)$(bindir)/ -+ $(INSTALL) -m 0755 -d $(DESTDIR)$(man1dir) -+ $(INSTALL) -m 0644 $(MAN_FILE) $(DESTDIR)$(man1dir)/ - --install : -- cp ${EXEC_NAME} ${INSTALL_DIR} -- # rm -f /usr/man/man1/beep.1.bz2 -- cp ${MAN_FILE} ${MAN_DIR} -+uninstall: -+ rm -f $(DESTDIR)$(bindir)/$(EXEC_NAME) -+ rm -f $(DESTDIR)$(man1dir)/$(MAN_FILE) --- -2.7.5 - diff --git a/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch b/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch deleted file mode 100644 index fe844e6f1c..0000000000 --- a/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4622dd15dc12dab47a0381a8a7188f0f0421e01d Mon Sep 17 00:00:00 2001 -From: Hans Ulrich Niedermann hun@n-dimensional.de -Date: Wed, 20 Nov 2013 00:00:54 +0100 -Subject: [PATCH] Preserve file modification time on install - -Add -p option to install(1) invocation in order to preserve -the timestamps of the files being installed. ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 942a7a5..290b8a4 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,10 +27,10 @@ $(EXEC_NAME): beep.c - $(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) beep.c - - install: all -- $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) -- $(INSTALL) -m 0755 $(EXEC_NAME) $(DESTDIR)$(bindir)/ -- $(INSTALL) -m 0755 -d $(DESTDIR)$(man1dir) -- $(INSTALL) -m 0644 $(MAN_FILE) $(DESTDIR)$(man1dir)/ -+ $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) -+ $(INSTALL) -m 0755 -p $(EXEC_NAME) $(DESTDIR)$(bindir)/ -+ $(INSTALL) -m 0755 -d $(DESTDIR)$(man1dir) -+ $(INSTALL) -m 0644 -p $(MAN_FILE) $(DESTDIR)$(man1dir)/ - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC_NAME) --- -2.7.5 diff --git a/src/patches/beep/0007-Fix-identation-if-brace-error.patch b/src/patches/beep/0007-Fix-identation-if-brace-error.patch deleted file mode 100644 index 30ec414062..0000000000 --- a/src/patches/beep/0007-Fix-identation-if-brace-error.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 35ba84dccb8fc8dc43cb3f575904a33ffa27e7b7 Mon Sep 17 00:00:00 2001 -From: Hans Ulrich Niedermann hun@n-dimensional.de -Date: Tue, 3 Apr 2018 19:11:07 +0200 -Subject: [PATCH] Fix indentation/if brace error - -As beep.c is not Python, the code blocks must be defined by -using braces instead of just indenting them differently. - -Once we do that, the outcome of multiple -f parameters will -actually match what the warning message documents beep does: -Only the last -f value will be used. - -Many projects proscribe using braces everywhere, but this -change keeps the beep.c coding style of using braces only -when absolutely necessary. - -This issue was discovered by compiling with gcc 6. ---- - beep.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/beep.c b/beep.c -index 7da2e70..d46adc8 100644 ---- a/beep.c -+++ b/beep.c -@@ -194,11 +194,12 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { - if(!sscanf(optarg, "%f", &argfreq) || (argfreq >= 20000 /* ack! */) || - (argfreq <= 0)) - usage_bail(argv[0]); -- else -+ else { - if (result->freq != 0) - fprintf(stderr, "WARNING: multiple -f values given, only last " - "one is used.\n"); - result->freq = argfreq; -+ } - break; - case 'l' : /* length */ - if(!sscanf(optarg, "%d", &argval) || (argval < 0)) --- -2.7.5 diff --git a/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch b/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch deleted file mode 100644 index ac1f0b5144..0000000000 --- a/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 3b67473e16aaf2f83cb8ac18c13c9183a8e3c7b2 Mon Sep 17 00:00:00 2001 -From: Hans Ulrich Niedermann hun@n-dimensional.de -Date: Tue, 3 Apr 2018 18:37:33 +0200 -Subject: [PATCH] Apply CVE-2018-0492.patch from Debian package - ---- - beep.c | 53 ++++++++++++++++++++++++----------------------------- - 1 file changed, 24 insertions(+), 29 deletions(-) - -diff --git a/beep.c b/beep.c -index d46adc8..f6781e8 100644 ---- a/beep.c -+++ b/beep.c -@@ -109,6 +109,7 @@ void do_beep(int freq) { - /* BEEP_TYPE_EVDEV */ - struct input_event e; - -+ memset(&e, 0, sizeof(e)); - e.type = EV_SND; - e.code = SND_TONE; - e.value = freq; -@@ -124,10 +125,6 @@ void do_beep(int freq) { - /* If we get interrupted, it would be nice to not leave the speaker beeping in - perpetuity. */ - void handle_signal(int signum) { -- -- if(console_device) -- free(console_device); -- - switch(signum) { - case SIGINT: - case SIGTERM: -@@ -258,7 +255,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { - result->verbose = 1; - break; - case 'e' : /* also --device */ -- console_device = strdup(optarg); -+ console_device = optarg; - break; - case 'h' : /* notice that this is also --help */ - default : -@@ -277,26 +274,6 @@ void play_beep(beep_parms_t parms) { - "%d delay after) @ %.2f Hz\n", - parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); - -- /* try to snag the console */ -- if(console_device) -- console_fd = open(console_device, O_WRONLY); -- else -- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) -- console_fd = open("/dev/vc/0", O_WRONLY); -- -- if(console_fd == -1) { -- fprintf(stderr, "Could not open %s for writing\n", -- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); -- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -- perror("open"); -- exit(1); -- } -- -- if (ioctl(console_fd, EVIOCGSND(0)) != -1) -- console_type = BEEP_TYPE_EVDEV; -- else -- console_type = BEEP_TYPE_CONSOLE; -- - /* Beep */ - for (i = 0; i < parms.reps; i++) { /* start beep */ - do_beep(parms.freq); -@@ -306,8 +283,6 @@ void play_beep(beep_parms_t parms) { - if(parms.end_delay || (i+1 < parms.reps)) - usleep(1000*parms.delay); /* wait... */ - } /* repeat. */ -- -- close(console_fd); - } - - -@@ -329,6 +304,26 @@ int main(int argc, char **argv) { - signal(SIGTERM, handle_signal); - parse_command_line(argc, argv, parms); - -+ /* try to snag the console */ -+ if(console_device) -+ console_fd = open(console_device, O_WRONLY); -+ else -+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) -+ console_fd = open("/dev/vc/0", O_WRONLY); -+ -+ if(console_fd == -1) { -+ fprintf(stderr, "Could not open %s for writing\n", -+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); -+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ -+ perror("open"); -+ exit(1); -+ } -+ -+ if (ioctl(console_fd, EVIOCGSND(0)) != -1) -+ console_type = BEEP_TYPE_EVDEV; -+ else -+ console_type = BEEP_TYPE_CONSOLE; -+ - /* this outermost while loop handles the possibility that -n/--new has been - used, i.e. that we have multiple beeps specified. Each iteration will - play, then free() one parms instance. */ -@@ -366,8 +361,8 @@ int main(int argc, char **argv) { - parms = next; - } - -- if(console_device) -- free(console_device); -+ close(console_fd); -+ console_fd = -1; - - return EXIT_SUCCESS; - } --- -2.7.5 diff --git a/src/patches/bridge-utils-1.5-compile-fix-1.patch b/src/patches/bridge-utils-1.5-compile-fix-1.patch deleted file mode 100644 index c2696086e3..0000000000 --- a/src/patches/bridge-utils-1.5-compile-fix-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5eebb7f9288b7881ffb929b1fd494fe3ac3be27d Mon Sep 17 00:00:00 2001 -From: Russell Senior russell@personaltelco.net -Date: Wed, 06 Mar 2013 20:49:42 +0000 -Subject: bridge-utils: Fix compile against linux-3.8.x - -Linux 3.8 has a header, include/uapi/linux/if_bridge.h that uses a -struct in6_addr but doesn't define it. The trivial seeming fix of -including the header that does define it causes more problems. The -problem was discussed on mailing lists in January 2013. The final -suggestion I found was here: - - http://www.redhat.com/archives/libvir-list/2013-January/msg01253.html - -This is intended to implement that suggestion. - -Signed-off-by: Russell Senior russell@personaltelco.net ---- -diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h -index 39964f2..dd14bae 100644 ---- a/libbridge/libbridge.h -+++ b/libbridge/libbridge.h -@@ -20,6 +20,7 @@ - #define _LIBBRIDGE_H - - #include <sys/socket.h> -+#include <netinet/in.h> - #include <linux/if.h> - #include <linux/if_bridge.h> - --- -cgit v0.9.2 diff --git a/src/patches/perl-Imager-1.024-include-t1tables.h-for-FT_Has_PS_Glyph_Names.patch b/src/patches/perl-Imager-1.024-include-t1tables.h-for-FT_Has_PS_Glyph_Names.patch new file mode 100644 index 0000000000..5afcfa68a9 --- /dev/null +++ b/src/patches/perl-Imager-1.024-include-t1tables.h-for-FT_Has_PS_Glyph_Names.patch @@ -0,0 +1,32 @@ +From 771ef328dcc4adc169b11334a3a9d940db82d250 Mon Sep 17 00:00:00 2001 +From: Niko Tyni ntyni@debian.org +Date: Sun, 15 Sep 2024 09:03:46 +0100 +Subject: [PATCH] include t1tables.h for FT_Has_PS_Glyph_Names + +This is no longer pulled in by ftmm.h since FreeType 2.13.3 + +Bug-Debian: https://bugs.debian.org/1081821 +Forwarded: https://github.com/tonycoz/imager/pull/533 +Bug: https://github.com/tonycoz/imager/pull/533 +Applied-Upstream: https://github.com/tonycoz/imager/commit/150c84cc0252de9bfe9ea14715e90c05293... + +--- + FT2/freetyp2.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/FT2/freetyp2.c b/FT2/freetyp2.c +index 87d5e571..92011f38 100644 +--- a/FT2/freetyp2.c ++++ b/FT2/freetyp2.c +@@ -47,6 +47,9 @@ Truetype, Type1 and Windows FNT. + #include FT_MULTIPLE_MASTERS_H + #endif + #endif ++#ifdef FT_TYPE1_TABLES_H ++#include FT_TYPE1_TABLES_H ++#endif + + static void ft2_push_message(int code); + +-- +2.45.2
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter