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 70fda2de626f7ad0a29a094612373cfc38b6bc66 (commit) via 6c94ccc62f1a339c03cd1764f0f2cd1a1678496e (commit) via 8ec35edb650f8e8c158499ba0efdd8abd64ba008 (commit) via 26776a9a87448122c26b08481987597c3d171625 (commit) via d446dbe217723dda0b27e5e94afe4b35d5731a48 (commit) via 42bf9f2c709d8f2dcd47c4fdcf937ea2429560a1 (commit) via 8343af9d0860591143bb65cf625deb4a1cc0c1f0 (commit) via 87a1445395aab294d081d6fbb5fa6d818049feff (commit) via 179032b7286bac4c96ed438e4cb9e8e491aa605d (commit) via 59d2ceb001652647a486a2bbe335931c83f6ef6e (commit) via 0ad3743e65cf63835c107bff9213b383947ce8a1 (commit) via af21533d92d6ddd6d0bdae272d2078d2d6704882 (commit) via fa5280c3f933e46e0d4eaeb8d3e8548bf3221e58 (commit) via e0602d8dc196861bc2aab3bead385e0301117f40 (commit) via 7bf9eaa386e14b654cbdfb6f34fcc24d9aa7d963 (commit) via 689e4bdf915095384d7ff160c6debd6717c78a14 (commit) via 9559bd712b8922461661da8431c3b27ea0f4a8f2 (commit) via 6a833927e00e616af02a62a04b71598bd23ea82b (commit) from 1e2abd66fb68498ec27d11d73f0b6241a03b3587 (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 70fda2de626f7ad0a29a094612373cfc38b6bc66 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:54:19 2024 +0100
core191: ship hwdata
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 6c94ccc62f1a339c03cd1764f0f2cd1a1678496e Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Nov 10 14:06:19 2024 +0100
hwdata: Update from individual file downloads to using a tarball source version 0.389
- This patch uses https://github.com/vcrhonek/hwdata/ to obtain the pci.ids & usb.ids files. Arch Linux uses this source and they have been providing the updates for around 8 years. - Updated lfs to use the new source tarball - Updated rootfile to only install the pci.ids & usb.ids files - This will make it easier to identify when there have been updates of the .ids files as there will be a new source tarball created.
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 8ec35edb650f8e8c158499ba0efdd8abd64ba008 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:52:24 2024 +0100
core191: ship harfbuzz
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 26776a9a87448122c26b08481987597c3d171625 Author: Adolf Belka adolf.belka@ipfire.org Date: Sun Nov 10 11:39:49 2024 +0100
harfbuzz: Update to version 10.1.0
- This v2 version corrects the Comment section of the lfs where a b2sum was accidentally pasted. - Update from version 8.2.2 to 10.1.0 - Update of rootfile - From version 9.0.0 meson is the only build system for harfbuzz - Changelog 10.1.0 - Fix the sign of fallback vertical glyph advance (used when font has no vertical advance data). - Increase maximum “CFF” operands limit 20 times to support more complex fonts. - Add “--face-loader” option to command line utilities. - Support “COLR” v0 table in hb_font_get_glyph_extents(). - Add support for font functions that use Core Text APIs, similar to FreeType font functions. This allows, for example, using drawing fonts that use the new (and undocumented) “hvgl” table. - Update IANA and OT language registries, as well ase USE data files. - Fix build with ICU 76. - Various compiler warnings and build fixes. - Various subsetter fixes. - New API: +hb_face_create_or_fail() +hb_face_create_from_file_or_fail() +hb_coretext_face_create_from_file_or_fail() +hb_coretext_font_set_funcs() +hb_ft_face_create_from_file_or_fail() 10.0.1 - Relax sanitization checks for “morx” subtables to fix broken AAT shaping of macOS 15.0 version of GeezaPro. 10.0.0 - Unicode 16.0.0 support. - Various documentation fixes. - Various build fixes. - Add API to allow HarfBuzz client to set what glyph to use when a Unicode Variation Selector is not supported by the font, which would allow the client to customize what happens in this case, by using a different font for example. - Add a callback to for “hb_face_t” for getting the list of table tags. This is now used to make calling “hb_face_get_table_tags()” work on a faces created by “hb_face_create_for_tables()” (e.g. faces returned by “hb_subset_or_fail()”). - CGJ and Mongolian Variation Selectors are now ignored during glyph positioning, previously they would block both glyph substitution and positioning across them. - Support cairo script as an output format for “hb-view” command line tool. - Drop an optimization that would cause HarfBuzz not apply pair positioning lookup subtables under certain circumstances, for compatibility with other implementations that do apply these subtables. - Subsetting will now fail if source font has no glyphs, so feeding the subsetter invalid data will not silently return an empty face. - If after partially instancing a font no variation data is left (the instance is fully static), don’t consider this a failure. - Workaround a Firefox bug in displaying SVGs generated be “hb-view” command line tool under certain circumstances. - Fix bug in macroman mapping for “cmap” table. - Fix difference shaping output when HarfBuzz is built with with “HB_NO_OT_RULESETS_FAST_PATH” enabled. - Various subsetting and instancing fixes. - Various fuzzing fixes. - Add “with_libstdcxx” meson build option. - New API: +HB_SCRIPT_GARAY +HB_SCRIPT_GURUNG_KHEMA +HB_SCRIPT_KIRAT_RAI +HB_SCRIPT_OL_ONAL +HB_SCRIPT_SUNUWAR +HB_SCRIPT_TODHRI +HB_SCRIPT_TULU_TIGALARI +hb_buffer_set_not_found_variation_selector_glyph() +hb_buffer_get_not_found_variation_selector_glyph() +hb_get_table_tags_func_t +hb_face_set_get_table_tags_func() 9.0.0 - HarfBuzz now the supports the proposed new OpenType “VARC” table. This replaces the previously supported “Variable Composites” experimental feature. “VARC” support is still experimental and it is not enabled unless HarfBuzz is built with experimental APIs enabled: https://github.com/harfbuzz/boring-expansion-spec/blob/main/VARC.md - Autotools build system have been dropped. Meson is the only supported build system in HarfBuzz going forward. - Speed up “AAT” shaping for short words by up to 4%. - Ignore unknown “CFF” operators. - “hb_subset_input_keep_everything()” now keeps also non-unicode “name” table records. - Update the IANA and OpenType language tag registries. - Support composite glyphs with very large number of points in hb-draw API. - Various build fixes. 8.5.0 - API for partial instancing is now stable and have been promoted out of experimental APIs. - Support instancing “BASE” table. - Speedup AAT shaping by 13–30%. - Various build fixes. - Various subsetter and instancer fixes. - New API: +HB_SUBSET_FLAGS_OPTIMIZE_IUP_DELTAS +hb_subset_input_get_axis_range() +hb_subset_input_pin_axis_location() 8.4.0 - Add /bigobj to MSVC compiler flags in meson build, to fix building hb-subset.cc - Specify minimum versions of various dependencies in meson and autotools build. - When subsetting, place variation store at the end of “GDEF” table to fix shaping issues with some versions of Adobe InDesign. - Various build fixes. - New API: +hb_buffer_set_random_state() +hb_buffer_get_random_state() 8.3.1 - hb_blob_create_from_file_or_fail() on Windows will now try to interpret the file name as UTF-8 first, and as system code page if it is not valid UTF-8. - Fix hb_style_get_value() in fonts with “STAT” table. - Properly handle negative offsets in CFF table. - Update IANA Language Subtag Registry to 2024-03-07. - Subsetter now supports subsetting “BASE” table. - Subsetter will update “hhea” font metrics in sync with “OS/2” ones. - “--variations” option of “hb-subset” now supports leaving out values that should be unchanged, e.g. “wght=:500:” will change the default and keep max and min unchanged. It also supports “*=drop” to to pin all axes to default location. - Fix hb_ot_math_get_glyph_kerning() to match updated “MATH” table spec. - Support legacy MacRoman encoding in “cmap” table. - Various build fixes. - Various subsetting and instancing fixes. - New API: hb_subset_input_pin_all_axes_to_default() 8.3.0 - Improve memory barrier to fix potential segfaults. - Various build fixes. - Various subsetting and instancing fixes. - Rename “hb-subset” option “--instance” to “--variations” to match the other tools. Old option is kept as an alias. - New API: HB_AAT_LAYOUT_FEATURE_TYPE_CURSIVE_CONNECTION - Deprecated API: HB_AAT_LAYOUT_FEATURE_TYPE_CURISVE_CONNECTION
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 d446dbe217723dda0b27e5e94afe4b35d5731a48 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:51:02 2024 +0100
core191: ship pixman
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 42bf9f2c709d8f2dcd47c4fdcf937ea2429560a1 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Nov 9 18:38:13 2024 +0100
pixman: Update to version 0.44.0
- Update from version 0.43.4 to 0.44.0 - Update of rootfile - Disabling iwmmxt no longer required as support for it in pixman has been dropped. - Changelog not provided. Review of changes only available by review of commits. https://gitlab.freedesktop.org/pixman/pixman/-/commits/master?ref_type=heads
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 8343af9d0860591143bb65cf625deb4a1cc0c1f0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:49:20 2024 +0100
core191: ship lvm2
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 87a1445395aab294d081d6fbb5fa6d818049feff Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Nov 9 18:38:12 2024 +0100
lvm2: Update to version 2.03.28
- Update from version 2.03.26 to 2.03.28 - Update of rootfile not required - Changelog 2.03.28 Use radix_tree to lookup for UUID within committed metadata. Use radix_tree to lookup LV list entry within VG struct. Introduce setting config/validate_metadata = full | none. Restore fs resize call for lvresize -r on the same size LV (2.03.17). Correct off-by-one devicesfile backup counting. Replace use of dm_hash with radix_tree for lv names and uuids. Refactor vg_validate with uniq_insert and better use of CPU caches. Add radix_tree_uniq_insert. Update DM cache when taking next VG lock instead of dropping it. Generate json string id only for json reporting. For vgsummary use new API call dm_config_parse_only_section(). Use radix_tree for PV names mapping. Split check_lv_segment into separate _in/complete_vg variant. Use find_lv instead of find_lv_in_vg when possible. Do a mirror fixup only when mirrors with logs are imported. Add faster crc32 calculation from zlib code for x86_64. Fall back to direct zeroing if BLKZEROOUT fails during new LV initialization. 2.03.27 Fix swap device size detection using blkid for lvresize/lvreduce/lvextend. Detect GPT partition table and pass partition filter if no partitions defined. Add global/sanlock_align_size option to configure sanlock lease size. Disable mem locking when activation/reserved_stack or reserved_memory is 0. Fix locking issues in lvmlockd leaving thin pool locked. Deprecate vdo settings vdo_write_policy and vdo_write_policy. Lots of typo fixes across lvm2 code base (codespell). Corrected integrity parameter interleave_sectors for DM table line. Ignore -i|--stripes, -I|--stripesize for lvextend on raid0 LV, like raid10. Do not accept duplicate device names for pvcreate.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 179032b7286bac4c96ed438e4cb9e8e491aa605d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:47:46 2024 +0100
core191: ship gnutls
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 59d2ceb001652647a486a2bbe335931c83f6ef6e Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Nov 9 18:38:10 2024 +0100
ffmpeg: Update to version 7.1
- Update from version 7.0.2 to 7.1 - Update of rootfile - Changelog 7.1 - Raw Captions with Time (RCWT) closed caption demuxer - LC3/LC3plus decoding/encoding using external library liblc3 - ffmpeg CLI filtergraph chaining - LC3/LC3plus demuxer and muxer - pad_vaapi, drawbox_vaapi filters - vf_scale supports secondary ref input and framesync options - vf_scale2ref deprecated - qsv_params option added for QSV encoders - VVC decoder compatible with DVB test content - xHE-AAC decoder - removed DEC Alpha DSP and support code - VVC encoding support via libvvenc - perlin video source - D3D12VA HEVC encoder - Cropping metadata parsing and writing in Matroska and MP4/MOV de/muxers - Intel QSV-accelerated VVC decoding - MediaCodec AAC/AMR-NB/AMR-WB/MP3 decoding - YUV colorspace negotiation for codecs and filters, obsoleting the YUVJ pixel format - Vulkan H.264 encoder - Vulkan H.265 encoder - stream specifiers in fftools can now match by stream disposition - LCEVC enhancement data exporting in H.26x and MP4/ISOBMFF - LCEVC filter - MV-HEVC decoding
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0ad3743e65cf63835c107bff9213b383947ce8a1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:46:23 2024 +0100
core191: ship expat
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit af21533d92d6ddd6d0bdae272d2078d2d6704882 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Nov 9 18:38:09 2024 +0100
expat: Update to version 2.6.4
- Update from version 2.6.3 to 2.6.4 - Update of rootfile - Changelog 2.6.4 Security fixes: #915 CVE-2024-50602 -- Fix crash within function XML_ResumeParser from a NULL pointer dereference by disallowing function XML_StopParser to (stop or) suspend an unstarted parser. A new error code XML_ERROR_NOT_STARTED was introduced to properly communicate this situation. // CWE-476 CWE-754 Other changes: #903 CMake: Add alias target "expat::expat" #905 docs: Document use via CMake >=3.18 with FetchContent and SOURCE_SUBDIR and its consequences #902 tests: Reduce use of global parser instance #904 tests: Resolve duplicate handler #317 #918 tests: Improve tests on doctype closing (ex CVE-2019-15903) #914 Fix signedness of format strings #919 #920 Version info bumped from 10:3:9 (libexpat*.so.1.9.3) to 11:0:10 (libexpat*.so.1.10.0); see https://verbump.de/ for what these numbers do Infrastructure: #907 CI: Upgrade Clang from 18 to 19 #913 CI: Drop macos-12 and add macos-15 #910 CI: Adapt to breaking changes in GitHub Actions #898 Add missing entries to .gitignore
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fa5280c3f933e46e0d4eaeb8d3e8548bf3221e58 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:45:10 2024 +0100
core191: ship curl
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit e0602d8dc196861bc2aab3bead385e0301117f40 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat Nov 9 18:38:08 2024 +0100
curl: Update to version 8.11.0
- Update from version 8.10.0 to 8.11.0 - Update of rootfile - Changelog 8.11.0 Changes: curl: --create-dirs works for --dump-header as well gtls: Add P12 format support ipfs: add options to disable TLS: TLSv1.3 earlydata support for curl WebSockets: make support official (non-experimental) Bugfixes: alt-svc: honor data->state.httpwant altsvc: avoid using local buffer and memcpy asyn-ares: remove typecast, fix expire autotools: add support for 'unity' builds, enable in CI bearssl: avoid strpcy() when generating TLS version log message bearssl: improved session handling, test exceptions bufq: unwrite fix build: add `ldap` to `libcurl.pc` `Requires:` build: add pytest targets build: clarify CA embed is for curl tool, mark default, improve summary build: detect and use `_setmode()` with Cygwin/MSYS, also use on Windows build: disable warning `-Wunreachable-code-break` build: fix clang-cl builds, add CI job build: fix cross-compile check for poll with bionic build: fix possible `-Wformat-overflow` in lib557 build: limit arc4random detection to no-SSL configs build: show if CA bundle to embed was found build: tidy up and improve versioned-symbols options build: tidy up deprecation suppression, enable warnings for clang certs: add missing `-CAcreateserial` option for LibreSSL checksrc: add check for spaces around logical AND operators checksrc: Added checks for colon operator in ternary expressions checksrc: check for spaces around '?', '>' and '<' ci: dump `curl_config.h` to log in all jobs CI: run with standard mod_http2 cmake, Makefile.mk: use -isystem for headers, silence BearSSL issues cmake/FindCares: fix version detection for c-ares 1.34.1 cmake/FindNGTCP2: use library path as hint for finding crypto module cmake: add missed variable to comment cmake: add native `pkg-config` detection for mbedTLS, MSH3, Quiche, Rustls, wolfSSL cmake: allow building tests in unity mode cmake: apply `WIN32_LEAN_AND_MEAN` to all feature checks cmake: avoid setting `BUILD_TESTING` cmake: clear package version after `pkg-config` detection cmake: delete unused NEED_LBER_H, HAVE_LDAP_H cmake: detect `HAVE_NETINET_IN6_H`, `HAVE_CLOSESOCKET_CAMEL`, `HAVE_PROTO_BSDSOCKET_H` cmake: detect GNU GSS cmake: disable default OpenSSL if BearSSL, GnuTLS or Rustls is enabled cmake: do not propagate unused `HAVE_GSSAPI_GSSAPI_KRB5_H` to C cmake: document `-D` and env build options cmake: drop obsolete items from `TODO` and `INSTALL-CMAKE` cmake: drop redundant assignments cmake: drop redundant zlib var, rename function (internals) cmake: expand CURL_USE_PKGCONFIG to non-cross MINGW cmake: fix broken dependency chain for cmdline-opts, tidy-ups cmake: fix compile warnings for clang-cl cmake: fix missing spacing in log message cmake: limit `CURL_STATIC_CRT` to MSVC cmake: make `test-ci` target skip building dependencies cmake: mark as advanced some internal Find* variables cmake: readd `generate-curl.1` dependency for `src` just in case cmake: rename LDAP dependency config variables to match Find modules cmake: replace `check_include_file_concat()` for LDAP and GSS detection cmake: replace `CURL_*_DIR` with `{PROJECT,CMAKE_CURRENT}_*_DIR` cmake: require quictls (or fork) when using msh3 on non-Windows cmake: separate target for examples, optimize CI, fix fallouts cmake: set version for `project()` and add CPack support cmake: stop adding dependency headers to global `CMAKE_REQUIRED_INCLUDES` cmake: sync torture test parallelism with autotools cmake: tidy up `CURL_DISABLE_FORM_API` initialization cmake: tidy up and shorten symbol hiding initialization cmake: tidy up line order cmake: tidy up picky warning initialization cmake: tidy-ups and rebase fixups cmake: tweaks around debug mode and hidden symbols cmake: untangle feature detection interdependencies cmake: use `list(APPEND)` on `CURL_INCLUDES` cmake: use OpenSSL for LDAP detection only if available cmake: use the `BSD` variable config: rename the OS define to CURL_OS to reduce collision risk configure: add GSS to `libcurl.pc` `Depends:` configure: catch Apple in more target triplets configure: drop duplicate feature checks for `poll()`, `if_nametoindex()` configure: drop unused bare `socket.h` detection configure: improve help string for some options conncache: find bundle again in case it is removed conncache: more efficient implementation of cpool_remove_bundle cookie: overhaul and cleanup curl-rustls.m4: set linker flags to allow rustls build on macos curl.h: remove the struct pointer for CURL/CURLSH/CURLM typedefs curl: add build options for safe/no CA bundle search (Windows) curl: detect ECH support dynamically, not at build time curl_addrinfo: support operating systems with only getaddrinfo(3) curl_multi_perform.md: fix typo curl_trc: fix build with verbose messages disabled curl_url_set.md: document HOST handling when URL is parsed curl_ws_recv.md: the 'meta' pointer is only returned on success curl_ws_recv: return recv 0 and point meta to NULL on all errors CURLMOPT_PIPELINING.md: clarify that CURLPIPE_NOTHING is not default CURLOPT_APPEND.md: goes for SFTP as well CURLOPT_HEADERFUNCTION.md: do not modify the passed in buffer DISABLED: disable test 1060 with hyper DISTROS: avoid use of "very" Dockerfile: update Docker digest to d830561 docs/cmdline-opts: GnuTLS supports PKCS#11 URI in --cert option docs: clarify FTP over HTTP proxy functionality somewhat docs: fix a typo in some cipher options ech: spelling, whitespace, say `--ech` default config ftp: fix 0-length last write on upload from stdin ftp: move listen handling to socket filter GHA: optimize test prereq steps gnutls: use session cache for QUIC hsts: avoid the local buffer and memcpy on lookup hsts: improve subdomain handling hsts: support "implied LWS" properly around max-age http2: auto reset stream on server eos http_aws_sigv4: avoid local buffer and strcpy INSTALL-CMAKE.md: mention focus on shared libraries INSTALL-CMAKE: fix punctuation and a typo INSTALL.md: fix a typo that slipped in to RISC OS json.md: cli-option `--json` is an alias of `--data-binary` lib, src, tests: added space around ternary expressions lib/cw-out: initialize 'flush_all' directly lib/src: white space edits to comply better with code style lib: avoid assigning 'result' temporarily lib: fix disabled-verbose-strings + enable-debug build warnings lib: fix unity builds with BearSSL, MSH3, Quiche, OmniOS lib: move curl_path.[ch] into vssh/ lib: msnprintf tidy-ups lib: remove Curl_ prefix from static functions lib: remove function pointer typecasts for hmac/sha256/md5 lib: use bool/TRUE/FALSE properly libcurl/opts: improve phrasing for connection cap related options libssh.c: handle EGAINS during proto-connect correctly libssh2: delete duplicate `break` libssh2: put the readdir buffers into struct libssh2: use the Curl_* memory functions to avoid memdebug libssh2: use the filename buffer when getting the homedir libtests: generate the lib1521 atomically mbedTLS: fix handling of TLSv1.3 sessions mbedtls: handle session as blobs mbedtls: remove failf() use from mbedtls_random mk-lib1521: fix the long return code check mprintf: do not ignore length modifiers of `%o`, `%x`, `%X` mprintf: treat `%o` as unsigned, add tests for `%o`, `%x`, `%X` mqtt: fix mqtt.md wording and add clearer explanation multi.c: make stronger check for paused transfer before asserting multi.c: warn/assert on stall only without timer multi: avoid reading whole struct pointer from pointer multi: convert Curl_follow to static multi_follow multi: make curl_multi_cleanup invalidate magic latter multi: make multi_handle_timeout use the connect timeout multi: split multi_runsingle into sub functions negotiate: conditional check around GSS & SSL specific code netrc: cache the netrc file in memory ngtcp2: do not loop on recv ngtcp2: set max window size to 10x of initial (128KB) openssl quic: populate x509 store before handshake openssl: convert a memcpy to dynbuf use openssl: extend the OpenSSL error messages openssl: improve retries on shutdown openssl: remove two strcpy() calls OS400: don't delete source files when building with debug packages/OS400/curlmain: remove the strncpy calls processhelp.pm: improve taskkill calls (Windows) pytest: fix run against multissl curl pytest: improve pytest_07_42a reliability pytest: include `buildinfo.txt` in the output pytest: include curl version string and python platform in log pytest: show curl features and protocols quic: use send/recvmmsg when available quic: use the session cache with wolfSSL as well request: on shutdown send, proceed normally on timeout runtests.md: suggest a value for -j for torture tests runtests: add comment for handle64 pathsep requirement runtests: drop unused code for old/classic-mingw support runtests: pass single backslashes with Windows Perl runtests: use deterministic sort for `TESTINFO` lines schannel: fix TLS cert verification by IP SAN schannel: ignore error on recv beyond close notify schannel: reclassify extra-verbose schannel_recv messages select: use poll() if existing, avoid poll() with no sockets sendf: add condition to max-filesize check server/mqttd: fix two memory leaks setopt: avoid superfluous length checks before strcmp() setopt: return error for bad input to CURLOPT_RTSP_REQUEST setopt_cptr: make overflow check only done when needed singleuse: make `git grep` faster, add Apple `nm` support smb: do not redefine `getpid` on Windows smb: replace use of strcpy() with snprintf() socks_gssapi: switch to dynbuf from buffer with strcpy source: avoid use of 'very' in comments src/lib: remove redundant ternary operators src: guard for double declaration of `curl_ca_embed` in unity builds sws: fix unused static function with `TCP_NODELAY` undefined telnet: avoid two strcpy() by pointing to the strings instead test1035: convert host name back to utf8 as should be test1515: add tracing and more debug info test1540: add debug logging test190: replace %FTPTIME2 with a fixed value test1915: add tracing and connect timeout test1915: remove wrong comment test2502: add libtest debug tracing test504: fix handling on pending connect testrun: explicitly set proper IP address for stunnel listen/connect tests/http: fix ubuntu GnuTLS CI failures tests/scorecard: allow remote server test tests/server/util.c: remove use of strncpy tests/valgrind.pm: fix warnings with no valgrind report to show tests/valgrind.supp: remove a travis suppression, add a Debian tests: add and use `%PERL` variable to refer to the Perl binary tests: add codeset-utf8 as a feature tests: add file: tests with existing files tests: allow pytests to run in out-of-tree builds tests: capture stdin to get the vsftpd version number tests: change Python code style to pass ruff checks tests: check http/2 and http/3 server responsiveness tests: delete duplicate macro check tests: enable additional ruff Python lint options tests: fix `%POSIX_PWD` on native Windows Perl tests: fix callback signatures to please UndefinedBehaviorSanitizer tests: Fix FILEFORMAT <file name=""> directive tests: fix keyword for test1411 tests: fix shell quoting on native Windows Perl tests: fix some Python typing issues tests: fixup `checkcmd` `PATH` on non-unixy platforms tests: improve mqtt server handling tests: introduce %CLIENT6IP-NB tests: let openssl generate random cert serials tests: libtests and unit tests need explicit #include memdebug tests: make precheck for HTTP on 127.0.0.1 into a feature tests: Only log warnings or worse by default in smbserver tests: postcheck is now in verify tests: remove all valgrind disable instructions tests: remove debug requirement on 38 tests tests: remove the %FTPTIME3 variable tests: replace `%PWD` with `%FILE_PWD` for `file://` tests: replace `%PWD` with `%SSH_PWD` in SCP/SFTP tests tests: replace hard-coded `/dev/null` with variable tests: simplify `pathhelp.pm`, avoid using external tools tests: speed up builds with single-binary test bundles tests: testrunner fairness tests: testrunner reliability improvements tests: use '-4' where needed tests: use a set for several of the curl_props tftp: avoid two memcpy/strcpy tidy-up: rename CURL_WINDOWS_APP to CURL_WINDOWS_UWP tls: avoid abusing CURLE_SSL_ENGINE_INITFAILED tool: support --show-headers AND --remote-header-name tool_doswin: simplify; remove unused options and strncpy calls tool_getparam: drop unused time() call tool_getparam: replace two uses of strncpy(), ban strncpy tool_operate: make --skip-existing work for --parallel tool_operate: reuse the schannel backend check tool_xattr: create the user.creator xattr attribute unit1307: tidy up Apple OS detection unit1660: fix unreachable code warning in no-SSL builds url: connection reuse on h3 connections url: use same credentials on redirect urlapi: drop unused header urlapi: normalize the IPv6 address version: minor cleanups version: say quictls in MSH3 builds vquic: fix compiler warning with gcc + MUSL vquic: recv_mmsg, use fewer, but larger buffers vtls: convert Curl_pin_peer_pubkey to use dynbuf vtls: convert pubkey_pem_to_der to use dynbuf warnless: remove curlx_sktosi and curlx_sitosk winbuild/README: consolidate command prompt section winbuild/README: document how to clean a build winbuild: add initial wolfSSL support winbuild: drop `gen_resp_file.bat` wolfssl: convert malloc + memcpys to dynbuf for cipher string wolfSSL: fix handling of TLSv1.3 sessions wolfssl: no more use of the OpenSSL API wolfssl: use old version API without openssl extra 8.10.1 Bugfixes: autotools: fix `--with-ca-embed` build rule cmake: ensure `CURL_USE_OPENSSL`/`USE_OPENSSL_QUIC` are set in sync cmake: fix MSH3 to appear on the feature list connect: store connection info when really done CURLMOPT_TIMERFUNCTION.md: emphasize that only a single timer should run FTP: partly revert eeb7c1280742f5c8fa48a4340fc1e1a1a2c7075a http2: when uploading data from stdin, fix eos forwarding http: make max-filesize check not count ignored bodies lib: fix AF_INET6 use outside of USE_IPV6 libcurl-docs: CURLINFO_LOCAL_* work for QUIC as well as TCP multi: check that the multi handle is valid in curl_multi_assign QUIC: on connect, keep on trying on draining server request: correctly reset the eos_sent flag runtests: accecpt 'quictls' as OpenSSL compatible rustls: fixed minor logic bug in default cipher selection rustls: rustls-ffi 0.14.0 update rustls: support strong CSRNG data setopt: remove superfluous use of ternary expressions singleuse: drop `Curl_memrchr()` for no-HTTP builds test537: cap the rlimit max this test runs tests: tweak lock file handling and timers tool_cb_wrt: use "curl_response" if no file name in URL transfer: fix sendrecv() without interim poll vtls: fix `Curl_ssl_conn_config_match` doc param
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7bf9eaa386e14b654cbdfb6f34fcc24d9aa7d963 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 8 16:40:55 2024 +0100
core191: start updater
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 689e4bdf915095384d7ff160c6debd6717c78a14 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Oct 16 18:50:20 2024 +0200
update.sh: Remove existing entries for the three FEODO_ tracker lists
- This removes any time entries in the modified file for either FEODO_RECOMMENDED, FEODO_IP or FEODO_AGGRESSIVE. - This also removes any blocklists for any of these sources from the /var/lib/ipblocklist directory. - This patch will ensure that any reference to any of these sources is removed from the ipblocklist files.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 9559bd712b8922461661da8431c3b27ea0f4a8f2 Author: Adolf Belka adolf.belka@ipfire.org Date: Wed Oct 16 18:50:19 2024 +0200
sources: Removal of Feodo Tracker lists from ipblocklist sources file
- FEODO_RECOMMENDED list is empty and has been since 2024-08-23, when it was last updated. - FEODO_IP list is empty and has been since 2024-08-23, when it was last updated. - FEODO_AGGRESSIVE list still contains IP's but they were last updated on 2024-08-23. - According to the Feodo Tracker web site these lists are updated every 5 minutes but not for nearly 8 weeks now. - Contacted Spamhaus who, since 2022, are the primary licensee for Abuse.ch, who created the Feodo Tracker lists. No response at all from Spamhaus after one week, not even any acknowledgement response. - This patch set removes these three lists from the sources file and an associated patch to the update.sh file removes references to these lists, if used, from the "modified" file and removes the "list_name.conf" files. - This is the same process as used for the removal of the ALIENVAULT list earlier this year.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 6a833927e00e616af02a62a04b71598bd23ea82b Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Oct 14 18:55:47 2024 +0200
netpbm: Removal of netpbm config.mk
- netpbm addon was removed from IPFire in April 2022. This configuration file was missed at that time.
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
-----------------------------------------------------------------------
Summary of changes: config/ipblocklist/sources | 20 - config/netpbm/config.mk | 690 --------------------- config/rootfiles/common/curl | 1 + config/rootfiles/common/expat | 20 +- config/rootfiles/common/harfbuzz | 196 +----- config/rootfiles/common/hwdata | 6 + config/rootfiles/common/pixman | 2 +- config/rootfiles/{oldcore/177 => core/191}/exclude | 0 .../core/{190 => 191}/filelists/core-files | 0 config/rootfiles/core/{190 => 191}/filelists/curl | 0 .../{oldcore/106 => core/191}/filelists/expat | 0 .../{oldcore/163 => core/191/filelists}/files | 0 .../{oldcore/110 => core/191}/filelists/gnutls | 0 .../{oldcore/163 => core/191}/filelists/harfbuzz | 0 .../{oldcore/132 => core/191}/filelists/hwdata | 0 config/rootfiles/core/{190 => 191}/filelists/lvm2 | 0 .../{oldcore/110 => core/191}/filelists/pixman | 0 .../rootfiles/{oldcore/187 => core/191}/update.sh | 39 +- config/rootfiles/{core => oldcore}/190/exclude | 0 .../{core => oldcore}/190/filelists/aarch64/linux | 0 .../rootfiles/{core => oldcore}/190/filelists/apr | 0 .../rootfiles/{core => oldcore}/190/filelists/bind | 0 .../190/filelists/ca-certificates | 0 .../{core => oldcore}/190/filelists/core-files | 0 .../rootfiles/{core => oldcore}/190/filelists/curl | 0 .../{core => oldcore}/190/filelists/files | 0 .../{core => oldcore}/190/filelists/libhtp | 0 .../{core => oldcore}/190/filelists/libpng | 0 .../{core => oldcore}/190/filelists/liburcu | 0 .../190/filelists/linux-firmware-config | 0 .../rootfiles/{core => oldcore}/190/filelists/lmdb | 0 .../{core => oldcore}/190/filelists/logrotate | 0 .../{core => oldcore}/190/filelists/logwatch | 0 .../rootfiles/{core => oldcore}/190/filelists/lvm2 | 0 .../rootfiles/{core => oldcore}/190/filelists/ncat | 0 .../{core => oldcore}/190/filelists/nettle | 0 .../{core => oldcore}/190/filelists/openssh | 0 .../rootfiles/{core => oldcore}/190/filelists/ppp | 0 .../{core => oldcore}/190/filelists/protobuf | 0 .../{core => oldcore}/190/filelists/protobuf-c | 0 .../{core => oldcore}/190/filelists/riscv64/linux | 0 .../{core => oldcore}/190/filelists/squid | 0 .../{core => oldcore}/190/filelists/suricata | 0 .../{core => oldcore}/190/filelists/texinfo | 0 .../{core => oldcore}/190/filelists/unbound | 0 .../190/filelists/x86_64/intel-microcode | 0 .../{core => oldcore}/190/filelists/x86_64/linux | 0 config/rootfiles/{core => oldcore}/190/update.sh | 15 + config/rootfiles/packages/ffmpeg | 16 +- lfs/curl | 4 +- lfs/expat | 4 +- lfs/ffmpeg | 6 +- lfs/harfbuzz | 15 +- lfs/hwdata | 42 +- lfs/lvm2 | 4 +- lfs/pixman | 5 +- make.sh | 2 +- 57 files changed, 121 insertions(+), 966 deletions(-) delete mode 100644 config/netpbm/config.mk copy config/rootfiles/{oldcore/177 => core/191}/exclude (100%) copy config/rootfiles/core/{190 => 191}/filelists/core-files (100%) copy config/rootfiles/core/{190 => 191}/filelists/curl (100%) copy config/rootfiles/{oldcore/106 => core/191}/filelists/expat (100%) copy config/rootfiles/{oldcore/163 => core/191/filelists}/files (100%) copy config/rootfiles/{oldcore/110 => core/191}/filelists/gnutls (100%) copy config/rootfiles/{oldcore/163 => core/191}/filelists/harfbuzz (100%) copy config/rootfiles/{oldcore/132 => core/191}/filelists/hwdata (100%) copy config/rootfiles/core/{190 => 191}/filelists/lvm2 (100%) copy config/rootfiles/{oldcore/110 => core/191}/filelists/pixman (100%) copy config/rootfiles/{oldcore/187 => core/191}/update.sh (76%) rename config/rootfiles/{core => oldcore}/190/exclude (100%) rename config/rootfiles/{core => oldcore}/190/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/190/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/190/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/190/filelists/ca-certificates (100%) rename config/rootfiles/{core => oldcore}/190/filelists/core-files (100%) rename config/rootfiles/{core => oldcore}/190/filelists/curl (100%) rename config/rootfiles/{core => oldcore}/190/filelists/files (100%) rename config/rootfiles/{core => oldcore}/190/filelists/libhtp (100%) rename config/rootfiles/{core => oldcore}/190/filelists/libpng (100%) rename config/rootfiles/{core => oldcore}/190/filelists/liburcu (100%) rename config/rootfiles/{core => oldcore}/190/filelists/linux-firmware-config (100%) rename config/rootfiles/{core => oldcore}/190/filelists/lmdb (100%) rename config/rootfiles/{core => oldcore}/190/filelists/logrotate (100%) rename config/rootfiles/{core => oldcore}/190/filelists/logwatch (100%) rename config/rootfiles/{core => oldcore}/190/filelists/lvm2 (100%) rename config/rootfiles/{core => oldcore}/190/filelists/ncat (100%) rename config/rootfiles/{core => oldcore}/190/filelists/nettle (100%) rename config/rootfiles/{core => oldcore}/190/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/190/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/190/filelists/protobuf (100%) rename config/rootfiles/{core => oldcore}/190/filelists/protobuf-c (100%) rename config/rootfiles/{core => oldcore}/190/filelists/riscv64/linux (100%) rename config/rootfiles/{core => oldcore}/190/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/190/filelists/suricata (100%) rename config/rootfiles/{core => oldcore}/190/filelists/texinfo (100%) rename config/rootfiles/{core => oldcore}/190/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/190/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/190/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/190/update.sh (87%)
Difference in files: diff --git a/config/ipblocklist/sources b/config/ipblocklist/sources index 1cef06dd12..c2fc40d5b1 100644 --- a/config/ipblocklist/sources +++ b/config/ipblocklist/sources @@ -61,26 +61,6 @@ our %sources = ( 'EMERGING_FWRULE' => { 'name' => 'Emerging Threats Blocklis 'parser' => 'dshield', 'rate' => '1h', 'category' => 'attacker' }, - 'FEODO_RECOMMENDED'=> {'name' => 'Feodo Trojan IP Blocklist (Recommended)', - 'url' => 'https://feodotracker.abuse.ch/downloads/ipblocklist_recommended.txt', - 'info' => 'https://feodotracker.abuse.ch/blocklist', - 'parser' => 'ip-or-net-list', - 'rate' => '5m', - 'category' => 'c and c' }, - 'FEODO_IP' => { 'name' => 'Feodo Trojan IP Blocklist', - 'url' => 'https://feodotracker.abuse.ch/downloads/ipblocklist.txt', - 'info' => 'https://feodotracker.abuse.ch/blocklist', - 'parser' => 'ip-or-net-list', - 'rate' => '5m', - 'category' => 'c and c', - 'disable' => 'FEODO_RECOMMENDED' }, - 'FEODO_AGGRESSIVE' => { 'name' => 'Feodo Trojan IP Blocklist (Aggressive)', - 'url' => 'https://feodotracker.abuse.ch/downloads/ipblocklist_aggressive.txt', - 'info' => 'https://feodotracker.abuse.ch/blocklist', - 'parser' => 'ip-or-net-list', - 'rate' => '5m', - 'category' => 'c and c', - 'disable' => ['FEODO_IP', 'FEODO_RECOMMENDED'] }, 'CIARMY' => { 'name' => 'The CINS Army List', 'url' => 'https://cinsscore.com/list/ci-badguys.txt', 'info' => 'https://cinsscore.com/#list', diff --git a/config/netpbm/config.mk b/config/netpbm/config.mk deleted file mode 100644 index 0cb85db6e5..0000000000 --- a/config/netpbm/config.mk +++ /dev/null @@ -1,690 +0,0 @@ -####This file was automatically created by 'configure.' -####Many variables are set twice -- a generic setting, then -####a system-specific override at the bottom of the file. -#### -# This is a make file inclusion, to be included in all the Netpbm make -# files. - -# This file is meant to contain variable settings that customize the -# build for a particular target system configuration. - -# The distribution contains the file config.mk.in. You edit -# config.mk.in in ways relevant to your particular environment -# to create config.mk. The "configure" program will do this -# for you in simple cases. - -# Some of the variables that the including make file must set for this -# file to work: -# -# SRCDIR: The directory at the top of the Netpbm source tree. Note that -# this is typically a relative directory, and it must be relative to the -# make file that includes this file. - -DEFAULT_TARGET = nonmerge -#DEFAULT_TARGET = merge - -# Fiasco has some special requirements that make it fail to compile on -# some systems, and since it isn't very important, just set this to "N" -# and skip it on those systems unless you want to debug it and fix it. -# OpenBSD: -#BUILD_FIASCO = N -BUILD_FIASCO = Y - -# The following are commands for the build process to use. These values -# do not get built into anything. - -# The C compiler (including macro preprocessor) -#CC = gcc -# Note that 'cc' is usually an alias for whatever is the main compiler -# on a system, e.g. the GNU Compiler on Linux. -CC = cc - -# The linker. -LD = $(CC) -#LD = ld -#Tru64: -#LD = cc -#LD = gcc - -#If the linker identified above is a compiler that invokes a linker -#(as in 'cc foo.o -o foo'), set LINKERISCOMPILER. The main difference is -#that we expect a compiler to take linker options in the '-Wl,-opt1,val1' -#syntax whereas the actual linker would take '-opt1 val1'. -LINKERISCOMPILER=Y -#If $(LD) is 'ld': -#LINKERISCOMPILER=N - -#LINKER_CAN_DO_EXPLICIT_LIBRARY means the linker specified above can -#take a library as just another link object argument, as in 'ld -#pnmtojpeg.o /usr/local/lib/libjpeg.so ...' as opposed to requiring a -#-l option as in 'ld pnmtojpeg.o -L/usr/local/lib -l jpeg'. -#This variable controls how 'libopt' gets built. Note that with some -#linkers, you can specify a shared library explicitly, but then it has -#to live in that exact place at run time. That's not good enough for us. - -LINKER_CAN_DO_EXPLICIT_LIBRARY=N -#GNU: -#LINKER_CAN_DO_EXPLICIT_LIBRARY=Y - -# This is the name of the header file that declares the types -# uint32_t, etc. This name is used as #include $(INTTYPES_H) . -# Set to null if the types come automatically without including anything. - -# We have a report (2005.09.17) that on IRIX 5.3 with the native IDO -# cc, inttypes.h and sys/types.h conflict (and Netpbm programs include -# sys/types for other things), so for that environment, <inttypes.h> -# won't work, but "inttypes_netpbm.h" might. - -INTTYPES_H = <inttypes.h> -# Linux libc5: -#INTTYPES_H = <types.h> -# Solaris: -# Solaris has <sys/inttypes.h>, but it doesn't define int_fast2_t, etc. -#INTTYPES_H = "inttypes_netpbm.h" -# Others: -#INTTYPES_H = <sys/stdint.h> -#INTTYPES_H = <sys/types.h> -# The automatically generated Netpbm version: -#INTTYPES_H = "inttypes_netpbm.h" - -# HAVE_INT64 tells whether, assuming you include the header indicated by -# INTTYPES_H, you have the int64_t type and related stuff. (If you don't -# the build will omit certain code that does 64 bit computations). -HAVE_INT64 = Y -#HAVE_INT64 = N - -# WANT_SSE tells whether the build should use SSE instructions, via the the -# standard SSE intrinsics (operators such as '_mm_movemask_epi8'). SSE -# instructions are faster than traditional instructions, but aren't available -# on all CPUs. Also, the standard intrinsics are not available in all -# compilers. Even if you say N here, Netpbm may still be built with some -# SSE exploitation (e.g. SSE floating point) because the compiler will -# do it automatically. You can add a -nomsse or -nomsse2 option to -# CFLAGS or CFLAGS_PERSONAL to stop that. -WANT_SSE = N -#WANT_SSE = Y - -# CC and LD are for building the Netpbm programs, which are not necessarily -# intended to run on the same system on which Make is running. But when we -# build a build tool such as Libopt, it is meant to run only on the same -# system on which the Make is running. The variables below define programs -# to use to compile and link build tools. -CC_FOR_BUILD = $(CC) -LD_FOR_BUILD = $(LD) -CFLAGS_FOR_BUILD = $(CFLAGS_CONFIG) -LDFLAGS_FOR_BUILD = $(LDFLAGS) - -# WINDRES is the program that creates a linkable object file from -# a Windows Icon (.ico) file. -WINDRES = windres - -# MAKE is set automatically by Make to what was used to invoke Make. - -INSTALL = $(SRCDIR)/buildtools/install.sh -#Solaris: -#INSTALL = /usr/ucb/install -#Tru64: -#INSTALL = installbsd -#OSF1: -#INSTALL = $(SRCDIR)/buildtools/installosf -#Red Hat Linux: -#INSTALL = install - -# STRIPFLAG is the option you pass to the above install program to make it -# strip unnecessary information out of binaries. -STRIPFLAG = -s -# If you don't want to strip the binaries, just leave it null: -#STRIPFLAG = - -SYMLINK = ln -s -# At least some Windows environments don't have any concept of symbolic -# links, but direct copies are usually a passable alternative. -#SYMLINK = cp - -#MANPAGE_FORMAT is "nroff" or "cat". It determines in what format the -#pointer man pages are installed (ready to nroff, or ready to cat). -#A pointer man pages is just a single-paragraph pages that tells you there is -#no man page for the program, to look at the HTML documentation instead. -MANPAGE_FORMAT = nroff -#MANPAGE_FORMAT = cat - -AR = ar -RANLIB = ranlib -# IRIX, SCO don't have Ranlib: -#RANLIB = true - -# LEX is the beginning of a shell command that runs a Lex-like -# pattern matcher generator. Null string means there isn't any such -# command. That means the build will skip parts that need one. - -LEX = flex -# Solaris: -# LEX = flex -e -# Windows Mingw: -# LEX = -# -# LEX = lex - -# C compiler options - -# gcc: -# -ansi and -Werror should work too, but are not included -# by default because there's no point in daring the build to fail. -# -pedantic isn't a problem because it causes at worst a warning. -#CFLAGS = -O3 -ffast-math -pedantic -fno-common \ -# -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit \ -# -Wwrite-strings -Wmissing-prototypes -Wundef -Wno-unknown-pragmas -# The merged programs have a main_XXX subroutine instead of main(), -# which would cause a warning with -Wmissing-declarations or -# -Wmissing-prototypes. -#CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes -# A user of DEC Tru64 4.0F in May 2000 needed -DLONG_32 for ppmtompeg, -# but word size-sensitive code was removed from parallel.c in September 2004. -# A user of Tru64 5.1A in July 2003 needed NOT to have -DLONG_32. In -# theory, you need this if on your system, long is 32 bits and int is not. -# But it may be completely irrelevant today. -#Tru64: -#CFLAGS = -O2 -std1 -DLONG_32 -#CFLAGS = -O2 -std1 -#AIX: -#CFLAGS= -O3 -#HP-UX: -#CFLAGS= -O3 -fPIC -#IRIX: -#CFLAGS= -n32 -O3 -#Amiga with GNU compiler: -#CFLAGS= -m68020-60 -ffast-math -mstackextend -# You can add -noixemul for Amiga and successfully compile most of the -# programs. (Of the remaining ones, if you can supply your own strtod() -# function, most of them will build with -noixemul). So try building -# with 'make --keep-going CADD=-noixemul' first, then just 'make' to build -# everything that failed for lack of the ixemul library in the first step. -# That way, the parts that don't required the ixemul library won't indicate -# a dependency on it. -#OpenBSD: -#CFLAGS = -I/usr/local/include - -# EXE is a suffix that the linker puts on any executable it generates. -# In cygwin, this is .exe and most programs deal with its existence without -# us having to know about it. Some don't though, so set this: - -EXE = -#Cygwin, DJGPP/Windows: -#EXE = .exe - -# linker options. - -# LDFLAGS is often set as an environment variable; A setting here overrides -# it. So either make sure you want to override it, or do a "LDFLAGS +=" here. - -# LDFLAGS is usually not the right place for a -L option, because we put -# LDFLAGS _before_ our own -L options, so it would cancel out our -# specific selection of libraries. For example, if you say -# LDFLAGS=/usr/local/lib and an old copy of the libnetpbm is in -# /usr/local/lib, then you'd be linking against that old copy instead of -# the copy you just built, which is located by a -L option later on the -# link command. LIBS is the right variable for adding -L options. LIBS -# goes after any of our make files' own -L options. - -# Eunice users may want to use -noshare so that the executables can -# run standalone: -#LDFLAGS += -noshare -#Tru64: -# Russ Allberry says on 2001.06.09 that -oldstyle_liblookup may be necessary -# to keep from finding an ancient system libjpeg.so that isn't compatible with -# NetPBM. Michael Long found that /usr/local/lib is not in the default -# search path, or not soon enough, and he was getting an old libjpeg that -# caused all the jpeg symbol references to be unresolved. He had installed -# a new libjpeg in /usr/local/lib. -#LDFLAGS += -call_shared -oldstyle_liblookup -L/usr/local/lib -#AIX: -#LDFLAGS += -L /usr/pubsw/lib -#HP-UX: -#LDFLAGS += -Wl,+b,/usr/pubsw/lib -#IRIX: -#LDFLAGS += -n32 - -# Linker options for created Netpbm shared libraries. - -# Here, $(SONAME) resolves to the soname for the shared library being created. -# The following are gcc options. This works on GNU libc systems. -LDSHLIB = -shared -Wl,-soname,$(SONAME) -# You need -nostart instead of -shared on BeOS. Though the BeOS compiler is -# ostensibly gcc, it has the -nostart option, which is not mentioned in gcc -# documentation and doesn't exist in at least one non-BeOS installation. -# BeOS doesn't have sonames built in. -#LDSHLIB = -nostart -#LDSHLIB = -G -# Solaris, SunOS with GNU Ld, SCO: -# These systems have no soname option. -#LDSHLIB = -shared -# Solaris with Sun Ld: -#LDSHLIB = -Wl,-Bdynamic,-G,-h,$(SONAME) -#Tru64: -#LDSHLIB = -shared -expect_unresolved "*" -#IRIX: -#LDSHLIB = -shared -n32 -#AIX GNU compiler/linker: -#LDSHLIB = -shared -#AIX Visual Age C: -#LDSHLIB = -qmkshrobj -#Mac OSX: -# According to experiments done by Peter A Crowley in May 2007, if -# libnetpbm goes in a standard place such as /usr/local/lib, -# programs need not be built with libnetpbm's location included. -# But if it goes elsewhere, the link-editor must include the -# location in the executable. It finds the runtime location by -# looking inside the library. The information in the library -# comes from the install_name option with which the library was -# built. It's an alternative to the -rpath option on other systems. -#LDSHLIB=-dynamiclib -#LDSHLIB=-dynamiclib -install_name $(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib - -# LDRELOC is the command to combine two .o files (relocateable object files) -# into a single .o file that can later be linked into something else. NONE -# means no such command is available. - -LDRELOC = NONE -# GNU Ld: -# Older GNU Ld misspells the option as --relocateable. Newer GNU Ld -# correctly spells it --relocatable. The abbreviation --reloc works on -# both. -#LDRELOC = ld --reloc -#LDRELOC = ld -r - - -# On older systems, you have to make shared libraries out of position -# independent code, so you need -fpic or fPIC here. (The rule is: if -# -fpic works, use it. If it bombs, go to fPIC). On newer systems, -# it isn't necessary, but can save real memory at the expense of -# execution speed. Without position independent code, the library -# loader may have to patch addresses into the executable text. On an -# older system, this would cause a program crash because the loader -# would be writing into read-only shared memory. But on newer -# systems, the system silently creates a private mapping of the page -# or segment being modified (the "copy on write" phenomenon). So it -# needs its own private real page frame. In one experiment, A second -# copy of Pbmtext used 16K less real memory when built with -fpic than -# when built without. 2001.06.02. - -# We have seen -fPIC required on IA64 and AMD64 machines (GNU -# compiler/linker). Build-time linking fails without it. I don't -# know why -- history seems to be repeating itself. 2005.02.23. - -CFLAGS_SHLIB = -# Gcc: -#CFLAGS_SHLIB = -fpic -#CFLAGS_SHLIB = -fPIC -# Sun compiler: -#CFLAGS_SHLIB = -Kpic -#CFLAGS_SHLIB = -KPIC - -# SHLIB_CLIB is the link option to include the C library in a shared library, -# normally "-lc". On typical systems, this serves no purpose. On some, -# though, it causes information about which C library to use to be recorded -# in the shared library and thus choose the correct library among several or -# avoid using an incompatible one. But on some systems, the link fails. -# On 2002.09.30, "John H. DuBois III" spcecdt@armory.com reports that on -# SCO OpenServer, he gets the following error message with -lc: -# -# -lc; relocations referenced ; from file(s) /usr/ccs/lib/libc.so(random.o); -# fatal error: relocations remain against allocatable but non-writable -# section: ; .text - -SHLIB_CLIB = -lc -# SCO: -#SHLIB_CLIB = - -# On some systems you have to build into an executable the list of -# directories where its dynamically linked libraries can be found at -# run time. This is typically done with a -R or -rpath linker -# option. Even on systems that don't require it, you might prefer to do -# that rather than set up environment variables or configuration files -# to tell the system where the libraries are. A "Y" here means to put -# the directory information in the executable at link time. - -NEED_RUNTIME_PATH = N -# Solaris, SunOS, NetBSD, AIX: -#NEED_RUNTIME_PATH = Y - -# RPATHOPTNAME is the option you use on the link command to specify -# a runtime search path for a shared library. It is meaningless unless -# NEED_RUNTIME_PATH is Y. -RPATHOPTNAME = -rpath - -# The following variables tell where your various libraries on which -# Netpbm depends live. The LIBxxx variable is a full file -# specification of the link library (not necessarily the library used -# at run time). e.g. "/usr/local/lib/graphics/libjpeg.so". It usually -# doesn't matter if the library prefix and suffix are right -- you can -# use "lib" and ".so" or ".a" regardless of what your system actually -# uses because these just turn into "-L" and "-l" linker options -# anyway. ".a" implies a static library for some purposes, though. -# If you don't have the library in question, use a value of NONE for -# LIBxxx and the build will simply skip the programs that require that -# library. If the library is in your linker's (or the Netpbm build's) -# default search path, leave off the directory part, e.g. "libjpeg.so". - -# The xxxHDR_DIR variable is the directory in which the interface -# headers for the library live (e.g. /usr/include). If they are in your -# compiler's default search path, set this variable to null. - -# This is where the Netpbm shared libraries will reside when Netpbm is -# fully installed. In some configurations, the Netpbm builder builds -# this information into the Netpbm executables. This does NOT affect -# where the Netpbm installer installs the libraries. A null value -# means the libraries are in a default search path used by the runtime -# library loader. -NETPBMLIB_RUNTIME_PATH = -#NETPBMLIB_RUNTIME_PATH = /usr/lib/netpbm - -# The TIFF library. See above. If you want to build the tiff -# converters, you must have the tiff library already installed. - -TIFFLIB = NONE -TIFFHDR_DIR = - -#TIFFLIB = libtiff.so -#TIFFHDR_DIR = /usr/include/libtiff -#NetBSD: -#TIFFLIB = $(LOCALBASE)/lib/libtiff.so -#TIFFHDR_DIR = $(LOCALBASE)/include -# OSF, Tru64: -#TIFFLIB = /usr/local1/DEC/lib/libtiff.so -#TIFFHDR_DIR = /usr/local1/DEC/include - -# Some TIFF libraries do Jpeg and/or Z (flate) compression and thus any -# program linked with the TIFF library needs a Jpeg and/or Z library. Some -# TIFF libraries have such library statically linked in, but others need it to -# be linked with the program at link-edit time or dynamically at program load -# time. Make this 'N' if your TIFF library doesn't need such linking. As of -# 2005.01, the most usual build of the TIFF library appears to require both. -TIFFLIB_NEEDS_JPEG = Y -TIFFLIB_NEEDS_Z = Y - -# The JPEG library. See above. If you want to build the jpeg -# converters you must have the jpeg library already installed. - -# Tiff files can use JPEG compression, so the Tiff library can reference -# the JPEG library. If your Tiff library references a dynamic JPEG -# library, you must specify at least JPEGLIB here, or the Tiff -# converters will not build. Note that your Tiff library may have the -# JPEG stuff statically linked in, in which case you won't need -# JPEGLIB in order to build the Tiff converters. - -JPEGLIB = NONE -JPEGHDR_DIR = -#JPEGLIB = libjpeg.so -#JPEGHDR_DIR = /usr/include/jpeg -# Netbsd: -#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so -#JPEGHDR_DIR = ${LOCALBASE}/include -# OSF, Tru64: -#JPEGLIB = /usr/local1/DEC/libjpeg.so -#JPEGHDR_DIR = /usr/local1/DEC/include -# Typical: -#JPEGLIB = /usr/local/lib/libjpeg.so -#JPEGHDR_DIR = /usr/local/include -# Don't build JPEG stuff: -#JPEGLIB = NONE - - -# The PNG library. See above. If you want to build the PNG -# converters you must have the PNG library already installed. - -# The PNG library, by convention starting around April 2002, gets installed -# with names that include a version number, such as libpng10.a and header -# files in /usr/include/libpng10. But there is conventionally an unnumbered -# alias (e.g. libpng.a, /usr/include/libpng) for the preferred version. -# -# Recent versions of the library (since some time in the 2002-2006 period) -# have an associated 'libpng-config' that tells how to link it. The make -# files will use that program if it exists (must be in the PATH). In that -# case, PNGLIB and PNGHDR_DIR are irrelevant, but PNGVER is still meaningful, -# because the make file runs 'libpng$(PNGVER)-config'. -# -# Even more recent versions have the more modern Pkgconfig database entry -# to tell how to link it. The make files will try to use that first. -# -# The normal way to choose the libpng the Netpbm build uses from among multiple -# versions on your system is not to mess with the variables below, but rather -# to mess with PKG_CONFIG_PATH or PATH environment variable so that the version -# you want to use appears first in the search path. - -PNGLIB = NONE -PNGHDR_DIR = -PNGVER = -#PNGLIB = libpng$(PNGVER).so -#PNGHDR_DIR = /usr/include/libpng$(PNGVER) -# NetBSD: -#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so -#PNGHDR_DIR = $(LOCALBASE)/include -# OSF/Tru64: -#PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so -#PNGHDR_DIR = /usr/local1/DEC/include - -# The zlib compression library. See above. You need it to build -# anything that needs the PNG library (see above). If you selected -# NONE for the PNG library, it doesn't matter what you specify here -- -# it won't get used. -# -# If you have 'libpng-config' (see above), these are irrelevant. - -ZLIB = NONE -ZHDR_DIR = -#ZLIB = libz.so - -# The JBIG lossless image compression library (aka JBIG-KIT): - -JBIGLIB = $(INTERNAL_JBIGLIB) -JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR) - -# The Jasper JPEG-2000 image compression library (aka JasPer): -JASPERLIB = $(INTERNAL_JASPERLIB) -JASPERHDR_DIR = $(INTERNAL_JASPERHDR_DIR) -# JASPERDEPLIBS is the libraries (-l options or file names) on which -# The Jasper library depends -- i.e. what you have to link into any -# executable that links in the Jasper library. -JASPERDEPLIBS = -#JASPERDEPLIBS = -ljpeg - -# And the Utah Raster Toolkit (aka URT aka RLE) library: - -URTLIB = $(BUILDDIR)/urt/librle.a -URTHDR_DIR = $(SRCDIR)/urt - -# The X11 library has facilities for talking to an X Window System -# server. It is required by Pamx. - -X11LIB = NONE -X11HDR_DIR = - -#X11LIB = /usr/lib/libX11.so -#X11HDR_DIR = - -# The Linux SVGA library (Svgalib) is a facility for displaying graphics -# on the Linux console. It is required by Ppmsvgalib. - -LINUXSVGALIB = NONE -LINUXSVGAHDR_DIR = - -#LINUXSVGALIB = /usr/lib/libvga.so -#LINUXSVGAHDR_DIR = /usr/include/vgalib - -# WINICON_OBJECT is the object file to bind into all Netpbm executables -# to provide the icon for Windows to use for it. Null for none. -WINICON_OBJECT = -#WINICON_OBJECT = $(BUILDDIR)/icon/netpbm.o - -# If you don't want any network functions, set OMIT_NETWORK to "Y". -# The only thing that requires network functions is the option in -# ppmtompeg to run it on multiple computers simultaneously. On some -# systems network functions don't work or we haven't figured out how to -# make them work, or they just aren't worth the effort. -OMIT_NETWORK = -#DJGPP/Windows, Tru64: -# (there's some minor header problem that prevents network functions from -# building on Tru64 2000.10.06) -#OMIT_NETWORK = Y - -# These are -l options to link in the network libraries. Often, these are -# built into the standard C library, so this can be null. This is irrelevant -# if OMIT_NETWORK is "Y". - -NETWORKLD = -# Solaris, SunOS: -#NETWORKLD = -lsocket -lnsl -# SCO: -#NETWORKLD = -lsocket, -lresolv - -# DONT_HAVE_PROCESS_MGMT is Y if this system doesn't have the usual -# Unix process management stuff - fork, wait, etc. N for a regular Unix -# system. -DONT_HAVE_PROCESS_MGMT = N - -# The following variables are used only by 'make install' (and the -# variants of it). Paths here don't, for example, get built into any -# programs. - -# This is where everything goes when you do 'make package', unless you -# override it by setting 'pkgdir' on the Make command line. -PKGDIR_DEFAULT = /tmp/netpbm - -# This is where test results are written when you do 'make check', unless -# you override it by setting 'resultdir' on the Make command line. -RESULTDIR_DEFAULT = /tmp/netpbm-test - -# Subdirectory of the package directory ($(pkgdir)) in which man pages -# go. -PKGMANDIR = share/man - -# File permissions for installed files. -# Note that on some systems (e.g. Solaris), 'install' can't use the -# mnemonic permissions - you have to use octal. - -# binaries (pbmmake, etc) -INSTALL_PERM_BIN = 755 # u=rwx,go=rx -# shared libraries (libpbm.so, etc) -INSTALL_PERM_LIBD = 755 # u=rwx,go=rx -# static libraries (libpbm.a, etc) -INSTALL_PERM_LIBS = 644 # u=rw,go=r -# header files (pbm.h, etc) -INSTALL_PERM_HDR = 644 # u=rw,go=r -# man pages (pbmmake.1, etc) -INSTALL_PERM_MAN = 644 # u=rw,go=r -# data files (pnmtopalm color maps, etc) -INSTALL_PERM_DATA = 644 # u=rw,go=r - -# Specify the suffix that want the man pages to have. - -SUFFIXMANUALS1 = 1 -SUFFIXMANUALS3 = 3 -SUFFIXMANUALS5 = 5 - -#NETPBMLIBTYPE tells the kind of libraries that will get built to hold the -#Netpbm library functions. The value is used only in make file tests. -# "unixshared" means a unix-style shared library, typically named like -# libxyz.so.2.3 -NETPBMLIBTYPE = unixshared -# "unixstatic" means a unix-style static library, (like libxyz.a) -#NETPBMLIBTYPE = unixstatic -# "dll" means a Windows DLL shared library -#NETPBMLIBTYPE = dll -# "dylib" means a Darwin/Mac OS shared library -#NETPBMLIBTYPE = dylib - -#NETPBMLIBSUFFIX is the suffix used on whatever kind of library is -#selected above. All this is used for is to construct library names. -#The make files never examine the actual value. -NETPBMLIBSUFFIX = so - -# "a" is the suffix for unix-style static libraries. It is also -# traditionally used for shared libraries on AIX. The Visual Age C -# manual says sometimes .so works on AIX, and GNU software for AIX -# 5.1.0 does indeed use it. In our experiments, it works fine if you -# name the library file explicitly on the link, but isn't in the -l -# search order. If you name the library explicitly on the link, the -# library must live in exactly the same position at run time, so we -# can't use that. Therefore, you cannot build both static and shared -# libraries with AIX. You have to choose. -#NETPBMLIBSUFFIX = a -# For HP-UX shared libraries: -#NETPBMLIBSUFFIX = sl -# Darwin/Mac OS shared library: -#NETPBMLIBSUFFIX = dylib -# Windows shared library: -#NETPBMLIBSUFFIX = dll - -#STATICLIB_TOO is "Y" to signify that you want a static library built -#and installed in addition to whatever library type you specified by -#NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, -#STATICLIB_TOO simply has no effect. -STATICLIB_TOO = Y -#STATICLIB_TOO = N - -#STATICLIBSUFFIX is the suffix that static libraries have. It's -#meaningless if you aren't building static libraries. -STATICLIBSUFFIX = a - -#SHLIBPREFIXLIST is a blank-delimited list of prefixes that a filename -#of a shared library may have on this system. Traditionally, it's -#just "lib", as in libc or libnetpbm. On Windows, though, varying -#prefixes are used when multiple alternative forms of a library are -#available. The first prefix in this list is what we use to name the -#Netpbm shared libraries. -# -# This variable controls how 'libopt' gets built. -# -SHLIBPREFIXLIST = lib -#Cygwin: -#SHLIBPREFIXLIST = cyg lib - -NETPBMSHLIBPREFIX = $(firstword $(SHLIBPREFIXLIST)) - -#DLLVER is used to version the DLLs built on cygwin or other -#windowsish platforms. We can't add this to LIBROOT, or we'd -#version the static libs (which is bad). We can't add this -#at the end of the name (like unix does with so numbers) because -#windows will only load dlls whose name ends in "dll". So, -#we have this variable, which becomes the end of the library "root" name -#for DLLs only. -# -# This variable controls how 'libopt' gets built. -# -DLLVER = -#Cygwin -#DLLVER = $(NETPBM_MAJOR_RELEASE) - -#NETPBM_DOCURL is the URL of the main documentation page for Netpbm. -#This is a directory which contains a file for each Netpbm program, -#library, and file type. E.g. The documentation for jpegtopnm might be in -#http://netpbm.sourceforge.net/doc/jpegtopnm.html . This value gets -#installed in the man pages (which say no more than to read the webpage) -#and in the Manweb netpbm.url file. -NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ -#For a system with no web access, but a local copy of the doc: -#NETPBM_DOCURL = file:/usr/doc/netpbm/ - -# RGB_DB_PATH is where Netpbm looks for the color database when the RGBDEF -# environment variable is not set. See pm_config_in.h for details. -RGB_DB_PATH = /usr/share/netpbm/rgb.txt:/usr/lib/X11/rgb.txt:/usr/share/X11/rgb.txt:/usr/X11R6/lib/X11/rgb.txt - - - - -####Lines above were copied from config.mk.in by 'configure'. -####Lines below were added by 'configure' based on the GNU platform. -DEFAULT_TARGET = nonmerge -NETPBMLIBTYPE=unixshared -NETPBMLIBSUFFIX=so -STATICLIB_TOO=N -CFLAGS = -O3 -ffast-math -pedantic -fno-common -Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit -Wwrite-strings -Wmissing-prototypes -Wundef -Wno-unknown-pragmas -CFLAGS_MERGE = -Wno-missing-declarations -Wno-missing-prototypes -LDRELOC = ld --reloc -LINKER_CAN_DO_EXPLICIT_LIBRARY=Y -LINKERISCOMPILER = Y -CFLAGS_SHLIB += -fPIC -TIFFLIB = libtiff.so -JPEGLIB = libjpeg.so -ZLIB = libz.so -NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl index be5ba351d5..7d0f477560 100644 --- a/config/rootfiles/common/curl +++ b/config/rootfiles/common/curl @@ -37,6 +37,7 @@ usr/lib/libcurl.so.4.8.0 #usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3 #usr/share/man/man3/CURLINFO_CONTENT_TYPE.3 #usr/share/man/man3/CURLINFO_COOKIELIST.3 +#usr/share/man/man3/CURLINFO_EARLYDATA_SENT_T.3 #usr/share/man/man3/CURLINFO_EFFECTIVE_METHOD.3 #usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3 #usr/share/man/man3/CURLINFO_FILETIME.3 diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 51a4de2f76..0f8af4b702 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -2,21 +2,21 @@ #usr/include/expat.h #usr/include/expat_config.h #usr/include/expat_external.h -#usr/lib/cmake/expat-2.6.3 -#usr/lib/cmake/expat-2.6.3/expat-config-version.cmake -#usr/lib/cmake/expat-2.6.3/expat-config.cmake -#usr/lib/cmake/expat-2.6.3/expat-noconfig.cmake -#usr/lib/cmake/expat-2.6.3/expat.cmake +#usr/lib/cmake/expat-2.6.4 +#usr/lib/cmake/expat-2.6.4/expat-config-version.cmake +#usr/lib/cmake/expat-2.6.4/expat-config.cmake +#usr/lib/cmake/expat-2.6.4/expat-noconfig.cmake +#usr/lib/cmake/expat-2.6.4/expat.cmake #usr/lib/libexpat.la #usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.9.3 +usr/lib/libexpat.so.1.10.0 #usr/lib/pkgconfig/expat.pc #usr/share/doc/expat -#usr/share/doc/expat-2.6.3 -#usr/share/doc/expat-2.6.3/ok.min.css -#usr/share/doc/expat-2.6.3/reference.html -#usr/share/doc/expat-2.6.3/style.css +#usr/share/doc/expat-2.6.4 +#usr/share/doc/expat-2.6.4/ok.min.css +#usr/share/doc/expat-2.6.4/reference.html +#usr/share/doc/expat-2.6.4/style.css #usr/share/doc/expat/AUTHORS #usr/share/doc/expat/changelog #usr/share/man/man1/xmlwf.1 diff --git a/config/rootfiles/common/harfbuzz b/config/rootfiles/common/harfbuzz index 1a933167b2..4fb716d84e 100644 --- a/config/rootfiles/common/harfbuzz +++ b/config/rootfiles/common/harfbuzz @@ -14,9 +14,13 @@ #usr/include/harfbuzz/hb-deprecated.h #usr/include/harfbuzz/hb-draw.h #usr/include/harfbuzz/hb-face.h +#usr/include/harfbuzz/hb-features.h #usr/include/harfbuzz/hb-font.h #usr/include/harfbuzz/hb-ft.h #usr/include/harfbuzz/hb-glib.h +#usr/include/harfbuzz/hb-gobject-enums.h +#usr/include/harfbuzz/hb-gobject-structs.h +#usr/include/harfbuzz/hb-gobject.h #usr/include/harfbuzz/hb-map.h #usr/include/harfbuzz/hb-ot-color.h #usr/include/harfbuzz/hb-ot-deprecated.h @@ -41,197 +45,19 @@ #usr/include/harfbuzz/hb.h #usr/lib/cmake/harfbuzz #usr/lib/cmake/harfbuzz/harfbuzz-config.cmake -#usr/lib/libharfbuzz-cairo.la #usr/lib/libharfbuzz-cairo.so usr/lib/libharfbuzz-cairo.so.0 -usr/lib/libharfbuzz-cairo.so.0.60822.0 -#usr/lib/libharfbuzz-subset.la +usr/lib/libharfbuzz-cairo.so.0.61010.0 +#usr/lib/libharfbuzz-gobject.so +usr/lib/libharfbuzz-gobject.so.0 +usr/lib/libharfbuzz-gobject.so.0.61010.0 #usr/lib/libharfbuzz-subset.so usr/lib/libharfbuzz-subset.so.0 -usr/lib/libharfbuzz-subset.so.0.60822.0 -#usr/lib/libharfbuzz.la +usr/lib/libharfbuzz-subset.so.0.61010.0 #usr/lib/libharfbuzz.so usr/lib/libharfbuzz.so.0 -usr/lib/libharfbuzz.so.0.60822.0 +usr/lib/libharfbuzz.so.0.61010.0 #usr/lib/pkgconfig/harfbuzz-cairo.pc +#usr/lib/pkgconfig/harfbuzz-gobject.pc #usr/lib/pkgconfig/harfbuzz-subset.pc #usr/lib/pkgconfig/harfbuzz.pc -#usr/share/gtk-doc/html/harfbuzz -#usr/share/gtk-doc/html/harfbuzz/HarfBuzz.png -#usr/share/gtk-doc/html/harfbuzz/HarfBuzz.svg -#usr/share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html -#usr/share/gtk-doc/html/harfbuzz/a-simple-shaping-example.html -#usr/share/gtk-doc/html/harfbuzz/aat-shaping.html -#usr/share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html -#usr/share/gtk-doc/html/harfbuzz/annotation-glossary.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-6-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-10.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-11.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-2.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-20.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-21.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-22.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-26.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-28.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-30.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-31.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-33.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-38.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-39.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-41.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-42.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-5.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-7.html -#usr/share/gtk-doc/html/harfbuzz/api-index-0-9-8.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-0-5.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-1-2.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-1-3.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-2-3.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-3-3.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-4-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-4-2.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-4-3.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-5-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-6-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-7-2.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-7-7.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-8-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-8-1.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-8-5.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-8-6.html -#usr/share/gtk-doc/html/harfbuzz/api-index-1-9-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-1-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-2-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-3-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-4-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-5-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-6-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-6-3.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-6-5.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-6-8.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-7-3.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-8-2.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-9-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-2-9-1.html -#usr/share/gtk-doc/html/harfbuzz/api-index-3-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-3-1-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-3-3-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-3-4-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-4-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-4-1-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-4-2-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-4-3-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-4-4-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-5-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-5-3-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-6-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-7-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-7-1-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-7-3-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-8-0-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-8-1-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-8-2-0.html -#usr/share/gtk-doc/html/harfbuzz/api-index-full.html -#usr/share/gtk-doc/html/harfbuzz/apple-advanced-typography-api.html -#usr/share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html -#usr/share/gtk-doc/html/harfbuzz/building.html -#usr/share/gtk-doc/html/harfbuzz/clusters.html -#usr/share/gtk-doc/html/harfbuzz/core-api.html -#usr/share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html -#usr/share/gtk-doc/html/harfbuzz/deprecated-api-index.html -#usr/share/gtk-doc/html/harfbuzz/fonts-and-faces-custom-functions.html -#usr/share/gtk-doc/html/harfbuzz/fonts-and-faces-native-opentype.html -#usr/share/gtk-doc/html/harfbuzz/fonts-and-faces-variable.html -#usr/share/gtk-doc/html/harfbuzz/fonts-and-faces.html -#usr/share/gtk-doc/html/harfbuzz/getting-started.html -#usr/share/gtk-doc/html/harfbuzz/glyphs-and-rendering.html -#usr/share/gtk-doc/html/harfbuzz/graphite-shaping.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-aat-layout.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-cairo.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-directwrite.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-draw.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-features.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-gdi.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-map.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-color.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-font.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-math.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-meta.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-metrics.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-name.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-var.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-paint.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-style.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-subset.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html -#usr/share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2 -#usr/share/gtk-doc/html/harfbuzz/home.png -#usr/share/gtk-doc/html/harfbuzz/index.html -#usr/share/gtk-doc/html/harfbuzz/install-harfbuzz.html -#usr/share/gtk-doc/html/harfbuzz/integration-api.html -#usr/share/gtk-doc/html/harfbuzz/integration-cairo.html -#usr/share/gtk-doc/html/harfbuzz/integration-coretext.html -#usr/share/gtk-doc/html/harfbuzz/integration-freetype.html -#usr/share/gtk-doc/html/harfbuzz/integration-icu.html -#usr/share/gtk-doc/html/harfbuzz/integration-python.html -#usr/share/gtk-doc/html/harfbuzz/integration-uniscribe.html -#usr/share/gtk-doc/html/harfbuzz/integration.html -#usr/share/gtk-doc/html/harfbuzz/left-insensitive.png -#usr/share/gtk-doc/html/harfbuzz/left.png -#usr/share/gtk-doc/html/harfbuzz/level-2.html -#usr/share/gtk-doc/html/harfbuzz/object-model-blobs.html -#usr/share/gtk-doc/html/harfbuzz/object-model-lifecycle.html -#usr/share/gtk-doc/html/harfbuzz/object-model-object-types.html -#usr/share/gtk-doc/html/harfbuzz/object-model-user-data.html -#usr/share/gtk-doc/html/harfbuzz/object-model.html -#usr/share/gtk-doc/html/harfbuzz/opentype-api.html -#usr/share/gtk-doc/html/harfbuzz/opentype-shaping-models.html -#usr/share/gtk-doc/html/harfbuzz/reference-manual.html -#usr/share/gtk-doc/html/harfbuzz/reordering-in-levels-0-and-1.html -#usr/share/gtk-doc/html/harfbuzz/right-insensitive.png -#usr/share/gtk-doc/html/harfbuzz/right.png -#usr/share/gtk-doc/html/harfbuzz/script-specific-shaping.html -#usr/share/gtk-doc/html/harfbuzz/setting-buffer-properties.html -#usr/share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html -#usr/share/gtk-doc/html/harfbuzz/shaping-concepts.html -#usr/share/gtk-doc/html/harfbuzz/shaping-opentype-features.html -#usr/share/gtk-doc/html/harfbuzz/shaping-operations.html -#usr/share/gtk-doc/html/harfbuzz/shaping-plans-and-caching.html -#usr/share/gtk-doc/html/harfbuzz/shaping-shaper-selection.html -#usr/share/gtk-doc/html/harfbuzz/style-api.html -#usr/share/gtk-doc/html/harfbuzz/style.css -#usr/share/gtk-doc/html/harfbuzz/subset-api.html -#usr/share/gtk-doc/html/harfbuzz/terminology.html -#usr/share/gtk-doc/html/harfbuzz/text-runs.html -#usr/share/gtk-doc/html/harfbuzz/the-distinction-between-levels-0-and-1.html -#usr/share/gtk-doc/html/harfbuzz/unicode-character-categories.html -#usr/share/gtk-doc/html/harfbuzz/up-insensitive.png -#usr/share/gtk-doc/html/harfbuzz/up.png -#usr/share/gtk-doc/html/harfbuzz/user-manual.html -#usr/share/gtk-doc/html/harfbuzz/utilities-common-types-apis.html -#usr/share/gtk-doc/html/harfbuzz/utilities.html -#usr/share/gtk-doc/html/harfbuzz/what-does-harfbuzz-do.html -#usr/share/gtk-doc/html/harfbuzz/what-harfbuzz-doesnt-do.html -#usr/share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html -#usr/share/gtk-doc/html/harfbuzz/why-do-i-need-a-shaping-engine.html -#usr/share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html -#usr/share/gtk-doc/html/harfbuzz/working-with-harfbuzz-clusters.html diff --git a/config/rootfiles/common/hwdata b/config/rootfiles/common/hwdata index db268e8878..1bca4a7257 100644 --- a/config/rootfiles/common/hwdata +++ b/config/rootfiles/common/hwdata @@ -1,3 +1,9 @@ +#usr/lib/modprobe.d +#usr/lib/modprobe.d/dist-blacklist.conf #usr/share/hwdata +#usr/share/hwdata/iab.txt +#usr/share/hwdata/oui.txt usr/share/hwdata/pci.ids +#usr/share/hwdata/pnp.ids usr/share/hwdata/usb.ids +#usr/share/pkgconfig/hwdata.pc diff --git a/config/rootfiles/common/pixman b/config/rootfiles/common/pixman index d6ed58f3cd..3f81a4b124 100644 --- a/config/rootfiles/common/pixman +++ b/config/rootfiles/common/pixman @@ -3,5 +3,5 @@ #usr/include/pixman-1/pixman.h #usr/lib/libpixman-1.so usr/lib/libpixman-1.so.0 -usr/lib/libpixman-1.so.0.43.4 +usr/lib/libpixman-1.so.0.44.0 #usr/lib/pkgconfig/pixman-1.pc diff --git a/config/rootfiles/core/191/exclude b/config/rootfiles/core/191/exclude new file mode 100644 index 0000000000..8ee1c3c2f5 --- /dev/null +++ b/config/rootfiles/core/191/exclude @@ -0,0 +1,35 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +boot/uEnv.txt +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/firewall/locationblock +var/ipfire/fwhosts/customlocationgrp +var/ipfire/ovpn +var/ipfire/urlfilter/blacklist +var/ipfire/urlfilter/settings +var/lib/alternatives +var/lib/location/database.db +var/lib/location/ipset +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/190/filelists/core-files b/config/rootfiles/core/191/filelists/core-files similarity index 100% rename from config/rootfiles/core/190/filelists/core-files rename to config/rootfiles/core/191/filelists/core-files diff --git a/config/rootfiles/core/190/filelists/curl b/config/rootfiles/core/191/filelists/curl similarity index 100% rename from config/rootfiles/core/190/filelists/curl rename to config/rootfiles/core/191/filelists/curl diff --git a/config/rootfiles/core/191/filelists/expat b/config/rootfiles/core/191/filelists/expat new file mode 120000 index 0000000000..e1923cf639 --- /dev/null +++ b/config/rootfiles/core/191/filelists/expat @@ -0,0 +1 @@ +../../../common/expat \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/files b/config/rootfiles/core/191/filelists/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/191/filelists/gnutls b/config/rootfiles/core/191/filelists/gnutls new file mode 120000 index 0000000000..8dbe60bc32 --- /dev/null +++ b/config/rootfiles/core/191/filelists/gnutls @@ -0,0 +1 @@ +../../../common/gnutls \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/harfbuzz b/config/rootfiles/core/191/filelists/harfbuzz new file mode 120000 index 0000000000..ffe1e0d0bd --- /dev/null +++ b/config/rootfiles/core/191/filelists/harfbuzz @@ -0,0 +1 @@ +../../../common/harfbuzz \ No newline at end of file diff --git a/config/rootfiles/core/191/filelists/hwdata b/config/rootfiles/core/191/filelists/hwdata new file mode 120000 index 0000000000..ced9116661 --- /dev/null +++ b/config/rootfiles/core/191/filelists/hwdata @@ -0,0 +1 @@ +../../../common/hwdata \ No newline at end of file diff --git a/config/rootfiles/core/190/filelists/lvm2 b/config/rootfiles/core/191/filelists/lvm2 similarity index 100% rename from config/rootfiles/core/190/filelists/lvm2 rename to config/rootfiles/core/191/filelists/lvm2 diff --git a/config/rootfiles/core/191/filelists/pixman b/config/rootfiles/core/191/filelists/pixman new file mode 120000 index 0000000000..fdb6346ae8 --- /dev/null +++ b/config/rootfiles/core/191/filelists/pixman @@ -0,0 +1 @@ +../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh new file mode 100644 index 0000000000..f1c254611e --- /dev/null +++ b/config/rootfiles/core/191/update.sh @@ -0,0 +1,82 @@ +#!/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 3 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) 2024 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=191 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# Remove any entry for FEODO_RECOMMENDED, FEODO_IP or FEODO_AGGRESSIVE from the ipblocklist +# modified file and the associated ipblocklist files from the /var/lib/ipblocklist directory +sed -i '/FEODO_RECOMMENDED=/d' /var/ipfire/ipblocklist/modified +sed -i '/FEODO_IP=/d' /var/ipfire/ipblocklist/modified +sed -i '/FEODO_AGGRESSIVE=/d' /var/ipfire/ipblocklist/modified +if [ -e /var/lib/ipblocklist/FEODO_RECOMMENDED.conf ]; then + rm /var/lib/ipblocklist/FEODO_RECOMMENDED.conf +fi +if [ -e /var/lib/ipblocklist/FEODO_IP.conf ]; then + rm /var/lib/ipblocklist/FEODO_IP.conf +fi +if [ -e /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf ]; then + rm /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf +fi + +# Remove files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services + +# This update needs a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/190/exclude b/config/rootfiles/oldcore/190/exclude similarity index 100% rename from config/rootfiles/core/190/exclude rename to config/rootfiles/oldcore/190/exclude diff --git a/config/rootfiles/core/190/filelists/aarch64/linux b/config/rootfiles/oldcore/190/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/190/filelists/aarch64/linux rename to config/rootfiles/oldcore/190/filelists/aarch64/linux diff --git a/config/rootfiles/core/190/filelists/apr b/config/rootfiles/oldcore/190/filelists/apr similarity index 100% rename from config/rootfiles/core/190/filelists/apr rename to config/rootfiles/oldcore/190/filelists/apr diff --git a/config/rootfiles/core/190/filelists/bind b/config/rootfiles/oldcore/190/filelists/bind similarity index 100% rename from config/rootfiles/core/190/filelists/bind rename to config/rootfiles/oldcore/190/filelists/bind diff --git a/config/rootfiles/core/190/filelists/ca-certificates b/config/rootfiles/oldcore/190/filelists/ca-certificates similarity index 100% rename from config/rootfiles/core/190/filelists/ca-certificates rename to config/rootfiles/oldcore/190/filelists/ca-certificates diff --git a/config/rootfiles/oldcore/190/filelists/core-files b/config/rootfiles/oldcore/190/filelists/core-files new file mode 100644 index 0000000000..0dec37e538 --- /dev/null +++ b/config/rootfiles/oldcore/190/filelists/core-files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +etc/os-release +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs diff --git a/config/rootfiles/oldcore/190/filelists/curl b/config/rootfiles/oldcore/190/filelists/curl new file mode 120000 index 0000000000..4b84bef53a --- /dev/null +++ b/config/rootfiles/oldcore/190/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/oldcore/190/filelists/files similarity index 100% rename from config/rootfiles/core/190/filelists/files rename to config/rootfiles/oldcore/190/filelists/files diff --git a/config/rootfiles/core/190/filelists/libhtp b/config/rootfiles/oldcore/190/filelists/libhtp similarity index 100% rename from config/rootfiles/core/190/filelists/libhtp rename to config/rootfiles/oldcore/190/filelists/libhtp diff --git a/config/rootfiles/core/190/filelists/libpng b/config/rootfiles/oldcore/190/filelists/libpng similarity index 100% rename from config/rootfiles/core/190/filelists/libpng rename to config/rootfiles/oldcore/190/filelists/libpng diff --git a/config/rootfiles/core/190/filelists/liburcu b/config/rootfiles/oldcore/190/filelists/liburcu similarity index 100% rename from config/rootfiles/core/190/filelists/liburcu rename to config/rootfiles/oldcore/190/filelists/liburcu diff --git a/config/rootfiles/core/190/filelists/linux-firmware-config b/config/rootfiles/oldcore/190/filelists/linux-firmware-config similarity index 100% rename from config/rootfiles/core/190/filelists/linux-firmware-config rename to config/rootfiles/oldcore/190/filelists/linux-firmware-config diff --git a/config/rootfiles/core/190/filelists/lmdb b/config/rootfiles/oldcore/190/filelists/lmdb similarity index 100% rename from config/rootfiles/core/190/filelists/lmdb rename to config/rootfiles/oldcore/190/filelists/lmdb diff --git a/config/rootfiles/core/190/filelists/logrotate b/config/rootfiles/oldcore/190/filelists/logrotate similarity index 100% rename from config/rootfiles/core/190/filelists/logrotate rename to config/rootfiles/oldcore/190/filelists/logrotate diff --git a/config/rootfiles/core/190/filelists/logwatch b/config/rootfiles/oldcore/190/filelists/logwatch similarity index 100% rename from config/rootfiles/core/190/filelists/logwatch rename to config/rootfiles/oldcore/190/filelists/logwatch diff --git a/config/rootfiles/oldcore/190/filelists/lvm2 b/config/rootfiles/oldcore/190/filelists/lvm2 new file mode 120000 index 0000000000..d640870b75 --- /dev/null +++ b/config/rootfiles/oldcore/190/filelists/lvm2 @@ -0,0 +1 @@ +../../../common/lvm2 \ No newline at end of file diff --git a/config/rootfiles/core/190/filelists/ncat b/config/rootfiles/oldcore/190/filelists/ncat similarity index 100% rename from config/rootfiles/core/190/filelists/ncat rename to config/rootfiles/oldcore/190/filelists/ncat diff --git a/config/rootfiles/core/190/filelists/nettle b/config/rootfiles/oldcore/190/filelists/nettle similarity index 100% rename from config/rootfiles/core/190/filelists/nettle rename to config/rootfiles/oldcore/190/filelists/nettle diff --git a/config/rootfiles/core/190/filelists/openssh b/config/rootfiles/oldcore/190/filelists/openssh similarity index 100% rename from config/rootfiles/core/190/filelists/openssh rename to config/rootfiles/oldcore/190/filelists/openssh diff --git a/config/rootfiles/core/190/filelists/ppp b/config/rootfiles/oldcore/190/filelists/ppp similarity index 100% rename from config/rootfiles/core/190/filelists/ppp rename to config/rootfiles/oldcore/190/filelists/ppp diff --git a/config/rootfiles/core/190/filelists/protobuf b/config/rootfiles/oldcore/190/filelists/protobuf similarity index 100% rename from config/rootfiles/core/190/filelists/protobuf rename to config/rootfiles/oldcore/190/filelists/protobuf diff --git a/config/rootfiles/core/190/filelists/protobuf-c b/config/rootfiles/oldcore/190/filelists/protobuf-c similarity index 100% rename from config/rootfiles/core/190/filelists/protobuf-c rename to config/rootfiles/oldcore/190/filelists/protobuf-c diff --git a/config/rootfiles/core/190/filelists/riscv64/linux b/config/rootfiles/oldcore/190/filelists/riscv64/linux similarity index 100% rename from config/rootfiles/core/190/filelists/riscv64/linux rename to config/rootfiles/oldcore/190/filelists/riscv64/linux diff --git a/config/rootfiles/core/190/filelists/squid b/config/rootfiles/oldcore/190/filelists/squid similarity index 100% rename from config/rootfiles/core/190/filelists/squid rename to config/rootfiles/oldcore/190/filelists/squid diff --git a/config/rootfiles/core/190/filelists/suricata b/config/rootfiles/oldcore/190/filelists/suricata similarity index 100% rename from config/rootfiles/core/190/filelists/suricata rename to config/rootfiles/oldcore/190/filelists/suricata diff --git a/config/rootfiles/core/190/filelists/texinfo b/config/rootfiles/oldcore/190/filelists/texinfo similarity index 100% rename from config/rootfiles/core/190/filelists/texinfo rename to config/rootfiles/oldcore/190/filelists/texinfo diff --git a/config/rootfiles/core/190/filelists/unbound b/config/rootfiles/oldcore/190/filelists/unbound similarity index 100% rename from config/rootfiles/core/190/filelists/unbound rename to config/rootfiles/oldcore/190/filelists/unbound diff --git a/config/rootfiles/core/190/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/190/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/190/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/190/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/190/filelists/x86_64/linux b/config/rootfiles/oldcore/190/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/190/filelists/x86_64/linux rename to config/rootfiles/oldcore/190/filelists/x86_64/linux diff --git a/config/rootfiles/core/190/update.sh b/config/rootfiles/oldcore/190/update.sh similarity index 87% rename from config/rootfiles/core/190/update.sh rename to config/rootfiles/oldcore/190/update.sh index 16ef608e2d..cec9492ebe 100644 --- a/config/rootfiles/core/190/update.sh +++ b/config/rootfiles/oldcore/190/update.sh @@ -145,6 +145,21 @@ if [ -e /boot/pakfire-kernel-update ]; then /boot/pakfire-kernel-update ${KVER} fi
+# Remove any entry for FEODO_RECOMMENDED, FEODO_IP or FEODO_AGGRESSIVE from the ipblocklist +# modified file and the associated ipblocklist files from the /var/lib/ipblocklist directory +sed -i '/FEODO_RECOMMENDED=/d' /var/ipfire/ipblocklist/modified +sed -i '/FEODO_IP=/d' /var/ipfire/ipblocklist/modified +sed -i '/FEODO_AGGRESSIVE=/d' /var/ipfire/ipblocklist/modified +if [ -e /var/lib/ipblocklist/FEODO_RECOMMENDED.conf ]; then + rm /var/lib/ipblocklist/FEODO_RECOMMENDED.conf +fi +if [ -e /var/lib/ipblocklist/FEODO_IP.conf ]; then + rm /var/lib/ipblocklist/FEODO_IP.conf +fi +if [ -e /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf ]; then + rm /var/lib/ipblocklist/FEODO_AGGRESSIVE.conf +fi + # This update needs a reboot... touch /var/run/need_reboot
diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index d6b7985f68..990f43b86e 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -152,28 +152,28 @@ usr/bin/ffprobe #usr/include/libswscale/version_major.h #usr/lib/libavcodec.so usr/lib/libavcodec.so.61 -usr/lib/libavcodec.so.61.3.100 +usr/lib/libavcodec.so.61.19.100 #usr/lib/libavdevice.so usr/lib/libavdevice.so.61 -usr/lib/libavdevice.so.61.1.100 +usr/lib/libavdevice.so.61.3.100 #usr/lib/libavfilter.so usr/lib/libavfilter.so.10 -usr/lib/libavfilter.so.10.1.100 +usr/lib/libavfilter.so.10.4.100 #usr/lib/libavformat.so usr/lib/libavformat.so.61 -usr/lib/libavformat.so.61.1.100 +usr/lib/libavformat.so.61.7.100 #usr/lib/libavutil.so usr/lib/libavutil.so.59 -usr/lib/libavutil.so.59.8.100 +usr/lib/libavutil.so.59.39.100 #usr/lib/libpostproc.so usr/lib/libpostproc.so.58 -usr/lib/libpostproc.so.58.1.100 +usr/lib/libpostproc.so.58.3.100 #usr/lib/libswresample.so usr/lib/libswresample.so.5 -usr/lib/libswresample.so.5.1.100 +usr/lib/libswresample.so.5.3.100 #usr/lib/libswscale.so usr/lib/libswscale.so.8 -usr/lib/libswscale.so.8.1.100 +usr/lib/libswscale.so.8.3.100 #usr/lib/pkgconfig/libavcodec.pc #usr/lib/pkgconfig/libavdevice.pc #usr/lib/pkgconfig/libavfilter.pc diff --git a/lfs/curl b/lfs/curl index 4b901cad78..c3d5d2762a 100644 --- a/lfs/curl +++ b/lfs/curl @@ -24,7 +24,7 @@
include Config
-VER = 8.10.0 +VER = 8.11.0
THISAPP = curl-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 18b438c0e4e7b0b698a1fee16406c611124e3d137349869dd8dbb43b5ba45163c6a053e02f665e627424c96e18f8499c13ebe1eeb4c1441936d0183d28696ae6 +$(DL_FILE)_BLAKE2 = 3db13ed558bee332e07e1eab878b5ecae14cd049c115eea3a25fcb78cf28aadfe577dc224df75b62844529994ec478a9a74fed5c9bae338f809d231420ae5d0a
install : $(TARGET)
diff --git a/lfs/expat b/lfs/expat index 91e4f32af8..eec344491f 100644 --- a/lfs/expat +++ b/lfs/expat @@ -24,7 +24,7 @@
include Config
-VER = 2.6.3 +VER = 2.6.4
THISAPP = expat-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = b8e0a0e779f0f136eaca91115cbbcf5a5cca457cab1cca6f8d6141151d19f8ef2dccb41b0e9134459c1e7d99cb2e0b4ce3922d2bd9221002ec43fe9d53a0084a +$(DL_FILE)_BLAKE2 = 70d716722358db8d0acb2c74dbbc9d2362d04a0b856eab6b6d723614b656cf6aad9f6646339e0a32b4151db2e9541439bcb81ec87791e5e6ec0bd36a3ca067cc
install : $(TARGET)
diff --git a/lfs/ffmpeg b/lfs/ffmpeg index 0431de1256..8b5be77029 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -26,7 +26,7 @@ include Config
SUMMARY = Library for working with various multimedia formats
-VER = 7.0.2 +VER = 7.1
THISAPP = ffmpeg-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 17 +PAK_VER = 18
DEPS = sdl2 lame libvorbis xvid
@@ -52,7 +52,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = f6536f41f784f1b49ed0728d80a522676dfe1facbeb7fec3f7796683ce28c73e41508f9a5dd1e5cd18d3ff787d562bb1e6a5085ee0660076b84a76040587e5a8 +$(DL_FILE)_BLAKE2 = 91b012d12a0f2bc1742d7d2e634e358d5d10976ad1fd0c44f40fa7a0fd102bc11e3b51237c2e3b0baa4b4d7d505e21d4336baa3293b20a7c4e3a0433dfc53362
install : $(TARGET)
diff --git a/lfs/harfbuzz b/lfs/harfbuzz index 8febd8a41e..a5a90eec2d 100644 --- a/lfs/harfbuzz +++ b/lfs/harfbuzz @@ -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 = 8.2.2 +VER = 10.1.0
THISAPP = harfbuzz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 5a26aa802b6e1afec734e59a9c280b4d336bb8ad72e0fbe6687237c150faa4d10fb2ae956b58394d7f6a2d1b97e6c91cd597a9b5146dcc3d2841d18d76611ec5 +$(DL_FILE)_BLAKE2 = 7d78e31d045b984d8d1a8b1d1f8f282ff9b7dc748ffd65355266266e75064b14eb94ec6b1418e208ebb0fffb99ef174d1978ab14f0c318c1112c2d8005285979
install : $(TARGET)
@@ -71,10 +71,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure \ + cd $(DIR_APP) && meson setup \ --prefix=/usr \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + -Dcpp_args=-fno-exceptions \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/hwdata b/lfs/hwdata index 0ac9f1855c..decf9b5829 100644 --- a/lfs/hwdata +++ b/lfs/hwdata @@ -24,27 +24,46 @@
include Config
-VER = ipfire +VER = 0.389
-THISAPP = hwdata +THISAPP = hwdata-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
-# https://pci-ids.ucw.cz/v2.2/pci.ids -# http://www.linux-usb.org/usb.ids +# https://github.com/vcrhonek/hwdata/releases?page=1
############################################################################### # Top-level Rules ###############################################################################
-objects = +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 967c107836e2cb6129d6432d116bae1ef57c8bf9212f5b052085029dc4dc7134b89237291ebec192d5031de6ff98338a253a1cdeed0a43a85c5ff37dd3d15b5c
install : $(TARGET)
-check : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK)
-download : +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD)
-b2 : +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM)
############################################################################### # Installation Details @@ -52,6 +71,9 @@ b2 :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir -p -m 755 /usr/share/hwdata - install -m 644 $(DIR_SRC)/src/hwdata/*.ids /usr/share/hwdata + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make install @$(POSTBUILD) diff --git a/lfs/lvm2 b/lfs/lvm2 index a3570bfd06..8992ecf169 100644 --- a/lfs/lvm2 +++ b/lfs/lvm2 @@ -24,7 +24,7 @@
include Config
-VER = 2.03.26 +VER = 2.03.28
THISAPP = LVM2.$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = bf7abb8cea32336d8e4c695111fa73fffb242925b2276ddbffcc74c5547a6338a8c7e0dab6a6f77efa31fb9a3f4fad59792b36dedd5c03baeef4dfff5fbf545d +$(DL_FILE)_BLAKE2 = c4c64975d39b9f5c8def0ec6a405b6aa158b6646fcc010724dc500cec7645a2f97b089665615c5fb0b03cd3c528c95f59122900b4f1d08d16364729c38acc10b
install : $(TARGET)
diff --git a/lfs/pixman b/lfs/pixman index 8b4644757d..858939c99a 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -24,7 +24,7 @@
include Config
-VER = 0.43.4 +VER = 0.44.0
THISAPP = pixman-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = c31e5700bfadcd72f522af50509a4a6cd7bbf90c918c75b108e50246f1c76e858125138902a222040ada192710ec788deb43eb65085416f3eff88e3ed970933e +$(DL_FILE)_BLAKE2 = ea3f5fc5e6febfd3e6acf89b9bb7ce2d7c82d42ede2b3f7df69ce6d65ec2d75d3402523a1a3227135caac34633556dec3010a435ace23f2c8255ea210c03d5db
install : $(TARGET)
@@ -73,7 +73,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && meson \ --prefix=/usr \ - -D iwmmxt=disabled \ builddir/ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) cd $(DIR_APP) && ninja -C builddir/ install diff --git a/make.sh b/make.sh index 35a602f625..bdf3f51234 100755 --- a/make.sh +++ b/make.sh @@ -23,7 +23,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.29" # Version number -CORE="190" # Core Level (Filename) +CORE="191" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive -- IPFire 2.x development tree