From 5dbd54b7bbd54c19f5990c7a3ea8008459d2b7e4 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 18 Dec 2025 18:38:57 +0100 Subject: [PATCH 1/8] steps/utils-std-0.1.1: add --- LICENSES/MPL-2.0.txt | 373 ++++++++++++++++++ steps/utils-std-0.1.1/pass1.sh | 13 + ...always-fallback-from-open-to-utimens.patch | 92 +++++ steps/utils-std-0.1.1/sources | 1 + 4 files changed, 479 insertions(+) create mode 100644 LICENSES/MPL-2.0.txt create mode 100644 steps/utils-std-0.1.1/pass1.sh create mode 100644 steps/utils-std-0.1.1/patches/touch-always-fallback-from-open-to-utimens.patch create mode 100644 steps/utils-std-0.1.1/sources diff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txt new file mode 100644 index 00000000..ee6256cd --- /dev/null +++ b/LICENSES/MPL-2.0.txt @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at https://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/steps/utils-std-0.1.1/pass1.sh b/steps/utils-std-0.1.1/pass1.sh new file mode 100644 index 00000000..81c8c7df --- /dev/null +++ b/steps/utils-std-0.1.1/pass1.sh @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: 2025 Haelwenn (lanodan) Monnier +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + sed -i s/_Noreturn// libutils/err.h +} + +src_configure() { + ./configure PREFIX="${PREFIX}" CC=tcc AR=tcc\ -ar +} diff --git a/steps/utils-std-0.1.1/patches/touch-always-fallback-from-open-to-utimens.patch b/steps/utils-std-0.1.1/patches/touch-always-fallback-from-open-to-utimens.patch new file mode 100644 index 00000000..cd296bb4 --- /dev/null +++ b/steps/utils-std-0.1.1/patches/touch-always-fallback-from-open-to-utimens.patch @@ -0,0 +1,92 @@ +From 7aa790a03f458ab41a4dc7b0b0810921ee5086ab Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Thu, 12 Feb 2026 01:30:49 +0100 +Subject: [PATCH] cmd/touch: always fallback from open() to utimens() +SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier +SPDX-License-Identifier: MPL-2.0 + +Allows to set new modification times on files without write access +but that you do own. + +And it is a behavior which POSIX requires. +--- + cmd/touch.c | 30 +++++++----------------------- + test-cmd/touch.sh | 9 ++++++--- + 2 files changed, 13 insertions(+), 26 deletions(-) + +diff --git a/cmd/touch.c b/cmd/touch.c +index 934dc83..a66ab74 100644 +--- utils-std-0.1.1/cmd/touch.c ++++ utils-std-0.1.1/cmd/touch.c +@@ -262,32 +262,16 @@ main(int argc, char *argv[]) + int fd = open(file, open_flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + if(fd == -1) + { +- /* BSD nonsense */ +-#ifdef EMLINK +- if(errno == EMLINK) errno = ELOOP; +-#endif +-#ifdef EFTYPE +- if(errno == EFTYPE) errno = ELOOP; +-#endif +- +- if(errno == EISDIR || (errno == ELOOP && FIELD_MATCH(open_flags, O_NOFOLLOW))) ++ if(utimensat(AT_FDCWD, file, times, utimensat_flags) != 0) + { +- if(utimensat(AT_FDCWD, file, times, utimensat_flags) != 0) +- { +- fprintf(stderr, +- "touch: error: Failed setting new times on file '%s': %s\n", +- file, +- strerror(errno)); +- return 1; +- } +- +- continue; ++ fprintf(stderr, ++ "touch: error: Failed setting new times on file '%s': %s\n", ++ file, ++ strerror(errno)); ++ return 1; + } + +- if(errno != ENOENT || FIELD_MATCH(open_flags, O_CREAT)) +- fprintf(stderr, "touch: error: Failed opening file '%s': %s\n", file, strerror(errno)); +- +- return 1; ++ continue; + } + + if(futimens(fd, times) != 0) +diff --git a/test-cmd/touch.sh b/test-cmd/touch.sh +index 96b21db..74b3cb3 100755 +--- utils-std-0.1.1/test-cmd/touch.sh ++++ utils-std-0.1.1/test-cmd/touch.sh +@@ -2,7 +2,7 @@ + # SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier + # SPDX-License-Identifier: MPL-2.0 + +-plans=36 ++plans=38 + + if ! command -v stat >/dev/null 2>/dev/null; then + echo '1..0 # SKIP: missing command: stat' +@@ -74,10 +74,13 @@ + t optt "-t 200306021337.42 $tempfile" + + touch_empty_str() { "$target" ''; } +-t_cmd --exit=1 empty_str "touch: error: Failed opening file '': No such file or directory ++t_cmd --exit=1 empty_str "touch: error: Failed setting new times on file '': No such file or directory + " touch_empty_str + +-t_cmd rm_tempfile '' rm "${tempfile}" ++t_cmd file_nowrite:chmod '' chmod -- =r "$tempfile" ++t file_nowrite "$tempfile" ++ ++t_cmd rm_tempfile '' rm -f "${tempfile}" + t_cmd rm_tempdir '' rm -r "${tempdir}" + + t_cmd eloop:setup '' ln -sf /var/empty/enoent eloop +-- +2.52.0 + diff --git a/steps/utils-std-0.1.1/sources b/steps/utils-std-0.1.1/sources new file mode 100644 index 00000000..a3cd49cf --- /dev/null +++ b/steps/utils-std-0.1.1/sources @@ -0,0 +1 @@ +f https://distfiles.hacktivis.me/releases/utils-std/utils-std-0.1.1.tar.gz b9dd07b32664c8e3a6e36f175ed087b3ddecefa66a3ec4f5c1927bb64b308c7a From c588f2415f14dbd9f80bb8d7df3062a8c836a25d Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 11 Feb 2026 21:49:03 +0100 Subject: [PATCH 2/8] steps/linux-headers-4.14.341-openela: Fix option ordering of mkdir -p With a POSIX conforming getopt() options ends at first non-option, so the -p has to be before the arguments. --- steps/linux-headers-4.14.341-openela/pass1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steps/linux-headers-4.14.341-openela/pass1.sh b/steps/linux-headers-4.14.341-openela/pass1.sh index 09ff7206..a80157fd 100755 --- a/steps/linux-headers-4.14.341-openela/pass1.sh +++ b/steps/linux-headers-4.14.341-openela/pass1.sh @@ -27,7 +27,7 @@ src_install() { # We "compile" the headers here because it is easier for d in include/uapi arch/x86/include/uapi; do cd "${d}" - find . -type d -exec mkdir "${DESTDIR}${PREFIX}/include/{}" -p \; + find . -type d -exec mkdir -p "${DESTDIR}${PREFIX}/include/{}" \; headers="$(find . -type f -name "*.h")" cd "${base_dir}" for h in ${headers}; do From 9f5e463282c2b5c9b5f22e20fde4e7ecf21be791 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 11 Feb 2026 22:29:44 +0100 Subject: [PATCH 3/8] steps/e2fsprogs-1.45.7: Add -D to $INSTALL so parent dirs get created --- steps/e2fsprogs-1.45.7/pass1.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/steps/e2fsprogs-1.45.7/pass1.sh b/steps/e2fsprogs-1.45.7/pass1.sh index 05979188..1b4daa34 100755 --- a/steps/e2fsprogs-1.45.7/pass1.sh +++ b/steps/e2fsprogs-1.45.7/pass1.sh @@ -37,7 +37,8 @@ src_prepare() { src_configure() { # defrag fails to build with musl 1.2.4 - ./configure --prefix="${PREFIX}" \ + INSTALL='/usr/bin/install -c -D' \ + ./configure --prefix="${PREFIX}" \ --sbindir="${PREFIX}/bin" \ --disable-tls \ --disable-defrag \ From d38fef1f8074bf107767d10fb7d2bf5cb59ebe40 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 20 Nov 2025 06:11:50 +0100 Subject: [PATCH 4/8] use utils-std-0.1.1 instead of coreutils-6.10 utils-std-0.1.1 doesn't replaces coreutils-5.0/pass1 due to depending on: * A shell for ./configure, making the bash implicit jump messy * POSIX C interfaces which mes-libc lacks Also coreutils-6.10 is only for utilities which utils-std provides: date, mktemp, sha256sum --- parts.rst | 8 ++++---- steps/SHA256SUMS.pkgs | 4 ++-- steps/manifest | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/parts.rst b/parts.rst index d5e0db3a..a5c5cf3b 100644 --- a/parts.rst +++ b/parts.rst @@ -521,11 +521,11 @@ coreutils 5.0 including ``comm``, ``expr``, ``dd``, ``sort``, ``sync``, ``uname`` and ``uniq``. This fixes a variety of issues with existing ``coreutils``. -coreutils 6.10 +utils-std 0.1.1 ============== -We build ``date``, ``mktemp`` and ``sha256sum`` from coreutils 6.10 which are -either missing or don't build correctly in 5.0. Other utils are not built at -this stage. + +Replaces most of coreutils 5.0 as well as providing few more utilities like +``date``, ``getconf``, ``mktemp``, and ``sha256sum`` gawk 3.0.4 ========== diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index aefab43a..5c3e2880 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -35,7 +35,6 @@ a0156d06536936dee9e696cbf6fb41087eaa1ce5cbc5d6e0067d3fd952ba7060 bison-3.8.2_0. e8271c1213b6cc7c9ae2ddb018cd093cbbd5f6e842548c0747ce95b13b6b9447 bzip2-1.0.8_0.tar.bz2 3ab45eca94432316ee120006686cc334a23187cbb795b550601d6288ccded111 ca-certificates-3.119.1_0.tar.bz2 982a3496ce3277c562acc896ba796939fe55a37432b2c76ab16b76e051a045a2 coreutils-5.0_0.tar.bz2 -27f283c42e2728d0d0682d56ada44b11ff11d07843e595c133a43f4c6aef53d0 coreutils-6.10_0.tar.bz2 61f5a1654935fbfd5358116bf2267236676aace3370cc6aaf8ff4fb1b4d020b2 coreutils-9.4_0.tar.bz2 912a256dd9a17deb6b48d1fe4c435313b242fa3bb63afef726e7c8ebe0b6a8ca curl-8.17.0_0.tar.bz2 a49f13bb73144bf9a8e70bc27cc7e0adce0f136762da82fc05e77c0382628c0f curl-8.17.0_1.tar.bz2 @@ -76,7 +75,7 @@ f27e1eaafa7ab198d2ed549aecfd8a1205d960f59a509789a159997565abd6d4 heirloom-devto bb1b1196caa7d4eebf37bdb8f355b63caa5b5642a696b7930c6c62c035180d59 libffi-3.3_0.tar.bz2 ce758eeb2964ae8756c3f8a52c6d436f4b9f102cfcfbdfa2ad2b5019947ff6d5 libffi-3.5.2_0.tar.bz2 9e1932db252894478dc98985f931312cbe5ee0eb40db251c75c79dd01294b15b libmd-1.1.0_0.tar.bz2 -311cc3a5ad4126b030b32bc1e9e787bd55caa861626d210bab4eb81e50244125 libtool-2.2.4_0.tar.bz2 +88e23e6c3f9aa8f1bd46ad40b08b05a4e6c8e667aa8926fcee92eee713f37e79 libtool-2.2.4_0.tar.bz2 a9ddd248e490623caeb0380089d03bc638e78af5c4fb65426f3b7f73521af604 libtool-2.4.7_0.tar.bz2 f41fe28a2b4854e0a08e120f21685d89cc9ffbee7449627eff279a70882229ed libunistring-1.4.1_0.tar.bz2 e34195462aa376c9ad92d77d68ef519c911100c06fe2f3929b260d0a811a4288 linux-4.14.341-openela_0.tar.bz2 @@ -149,6 +148,7 @@ ab49972345d0c05f79b9370530829792e8c5c3b7fe283fc90e1dff26c2d0f6db tcc-0.9.27_2.t 8576a7c99802bb462dd044ef7df7263192f1acfabde47462afd6145ffec1e4f1 tcc-0.9.27_3.tar.bz2 252cc7226bef56e9dc591433ab2176cf1dd54dd18de20535edb708d5c6c21dce texinfo-7.2_0.tar.bz2 b54b1aa40dc08eec51982fd581a64a900e2598ba29acc6ca9c2b1b2321603b49 util-linux-2.19.1_0.tar.bz2 +c1f666d6b88d124cae179eb4c67310fe9af8d1a610494a1c5f27473516acd61e utils-std-0.1.1_0.tar.bz2 9075b6832d8d7b094775c8e6ead763851aec96f4559d8cd62ce0a25e7a8a70ab which-2.21_0.tar.bz2 d7357c5a73e4a0adb07220392316185716c42003fe7e63b63ba8493f12f3621b xz-5.6.4_0.tar.bz2 9b10db90e06129fd174d48edb60a6d1e2fa72944fccef420431f8e836adcf972 zlib-1.3.1_0.tar.bz2 diff --git a/steps/manifest b/steps/manifest index 1f878a28..7d9c6398 100644 --- a/steps/manifest +++ b/steps/manifest @@ -78,7 +78,7 @@ build: bison-3.4.1 build: bison-3.4.1 build: diffutils-2.7 build: coreutils-5.0 -build: coreutils-6.10 +build: utils-std-0.1.1 build: gawk-3.0.4 build: perl-5.000 build: perl-5.003 From 8cde6de54a46fb137e22402d9e0758a221dcf3cb Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 12 Feb 2026 16:28:31 +0100 Subject: [PATCH 5/8] steps/utils-std-0.1.1: toss out getconf(1) --- parts.rst | 2 +- steps/SHA256SUMS.pkgs | 2 +- steps/utils-std-0.1.1/pass1.sh | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parts.rst b/parts.rst index a5c5cf3b..c4063721 100644 --- a/parts.rst +++ b/parts.rst @@ -525,7 +525,7 @@ utils-std 0.1.1 ============== Replaces most of coreutils 5.0 as well as providing few more utilities like -``date``, ``getconf``, ``mktemp``, and ``sha256sum`` +``date``, ``mktemp``, and ``sha256sum`` gawk 3.0.4 ========== diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index 5c3e2880..ee8cbc62 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -75,7 +75,7 @@ f27e1eaafa7ab198d2ed549aecfd8a1205d960f59a509789a159997565abd6d4 heirloom-devto bb1b1196caa7d4eebf37bdb8f355b63caa5b5642a696b7930c6c62c035180d59 libffi-3.3_0.tar.bz2 ce758eeb2964ae8756c3f8a52c6d436f4b9f102cfcfbdfa2ad2b5019947ff6d5 libffi-3.5.2_0.tar.bz2 9e1932db252894478dc98985f931312cbe5ee0eb40db251c75c79dd01294b15b libmd-1.1.0_0.tar.bz2 -88e23e6c3f9aa8f1bd46ad40b08b05a4e6c8e667aa8926fcee92eee713f37e79 libtool-2.2.4_0.tar.bz2 +311cc3a5ad4126b030b32bc1e9e787bd55caa861626d210bab4eb81e50244125 libtool-2.2.4_0.tar.bz2 a9ddd248e490623caeb0380089d03bc638e78af5c4fb65426f3b7f73521af604 libtool-2.4.7_0.tar.bz2 f41fe28a2b4854e0a08e120f21685d89cc9ffbee7449627eff279a70882229ed libunistring-1.4.1_0.tar.bz2 e34195462aa376c9ad92d77d68ef519c911100c06fe2f3929b260d0a811a4288 linux-4.14.341-openela_0.tar.bz2 diff --git a/steps/utils-std-0.1.1/pass1.sh b/steps/utils-std-0.1.1/pass1.sh index 81c8c7df..c5c108e6 100644 --- a/steps/utils-std-0.1.1/pass1.sh +++ b/steps/utils-std-0.1.1/pass1.sh @@ -6,6 +6,7 @@ src_prepare() { default sed -i s/_Noreturn// libutils/err.h + sed -i '/^commands="$/,/^"$/'s,getconf,, configure } src_configure() { From 044cc7bafa78d2e19f16d6ed2753f02bb85da6c0 Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Thu, 12 Feb 2026 16:31:45 +0100 Subject: [PATCH 6/8] steps/utils-std-0.1.1: add upstream patches for reallocarray fallback --- LICENSES/0BSD.txt | 5 + steps/SHA256SUMS.pkgs | 2 +- steps/utils-std-0.1.1/pass1.sh | 5 + .../patches/reallocarray.patch | 320 ++++++++++++++++++ 4 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 LICENSES/0BSD.txt create mode 100644 steps/utils-std-0.1.1/patches/reallocarray.patch diff --git a/LICENSES/0BSD.txt b/LICENSES/0BSD.txt new file mode 100644 index 00000000..0b8ae762 --- /dev/null +++ b/LICENSES/0BSD.txt @@ -0,0 +1,5 @@ +Copyright (C) YEAR by AUTHOR EMAIL + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index ee8cbc62..8e9a765c 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -148,7 +148,7 @@ ab49972345d0c05f79b9370530829792e8c5c3b7fe283fc90e1dff26c2d0f6db tcc-0.9.27_2.t 8576a7c99802bb462dd044ef7df7263192f1acfabde47462afd6145ffec1e4f1 tcc-0.9.27_3.tar.bz2 252cc7226bef56e9dc591433ab2176cf1dd54dd18de20535edb708d5c6c21dce texinfo-7.2_0.tar.bz2 b54b1aa40dc08eec51982fd581a64a900e2598ba29acc6ca9c2b1b2321603b49 util-linux-2.19.1_0.tar.bz2 -c1f666d6b88d124cae179eb4c67310fe9af8d1a610494a1c5f27473516acd61e utils-std-0.1.1_0.tar.bz2 +e56eb357986fea273309e72f2faa2b86da492e104ab216014d1b76526e242346 utils-std-0.1.1_0.tar.bz2 9075b6832d8d7b094775c8e6ead763851aec96f4559d8cd62ce0a25e7a8a70ab which-2.21_0.tar.bz2 d7357c5a73e4a0adb07220392316185716c42003fe7e63b63ba8493f12f3621b xz-5.6.4_0.tar.bz2 9b10db90e06129fd174d48edb60a6d1e2fa72944fccef420431f8e836adcf972 zlib-1.3.1_0.tar.bz2 diff --git a/steps/utils-std-0.1.1/pass1.sh b/steps/utils-std-0.1.1/pass1.sh index c5c108e6..512764b1 100644 --- a/steps/utils-std-0.1.1/pass1.sh +++ b/steps/utils-std-0.1.1/pass1.sh @@ -6,9 +6,14 @@ src_prepare() { default sed -i s/_Noreturn// libutils/err.h + + # to avoid changing libtool checksums, although likely means better values sed -i '/^commands="$/,/^"$/'s,getconf,, configure } src_configure() { + # patch(1) strips out permissions + chmod +x configure + ./configure PREFIX="${PREFIX}" CC=tcc AR=tcc\ -ar } diff --git a/steps/utils-std-0.1.1/patches/reallocarray.patch b/steps/utils-std-0.1.1/patches/reallocarray.patch new file mode 100644 index 00000000..95b5cfd6 --- /dev/null +++ b/steps/utils-std-0.1.1/patches/reallocarray.patch @@ -0,0 +1,320 @@ +SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier +SPDX-License-Identifier: MPL-2.0 + +diff --git utils-std-0.1.1/cmd/cut.c utils-std-0.1.1/cmd/cut.c +index e56a4ca..2481759 100644 +--- utils-std-0.1.1/cmd/cut.c ++++ utils-std-0.1.1/cmd/cut.c +@@ -5,8 +5,8 @@ + #define _POSIX_C_SOURCE 202405L + + #include "../config.h" +-#include "../lib/reallocarray.h" + #include "../libutils/getopt_nolong.h" ++#include "../libutils/reallocarray.h" + + #include + #include +@@ -121,7 +121,7 @@ parse_list(char *s) + + if(max > list_len) + { +- list = reallocarray(list, max, sizeof(*list)); ++ list = utils_reallocarray(list, max, sizeof(*list)); + if(list == NULL) + { + fprintf(stderr, "%s: error: Failed memory allocation: %s\n", argv0, strerror(errno)); +@@ -285,7 +285,7 @@ cut_c(FILE *in, const char *filename) + + if(nread > line_wsz) + { +- line_w = reallocarray(line_w, nread, sizeof(*line_w)); ++ line_w = utils_reallocarray(line_w, nread, sizeof(*line_w)); + if(line_w == NULL) + { + fprintf(stderr, "%s: error: Failed memory allocation: %s\n", argv0, strerror(errno)); +diff --git utils-std-0.1.1/cmd/df.c utils-std-0.1.1/cmd/df.c +index 85627a0..61082ca 100644 +--- utils-std-0.1.1/cmd/df.c ++++ utils-std-0.1.1/cmd/df.c +@@ -6,9 +6,9 @@ + #define _DEFAULT_SOURCE // mntent in glibc 2.19+ + + #include "../config.h" +-#include "../lib/reallocarray.h" + #include "../libutils/getopt_nolong.h" + #include "../libutils/humanize.h" ++#include "../libutils/reallocarray.h" + + #include // iscntrl, isspace + #include // errno +@@ -249,7 +249,7 @@ main(int argc, char *argv[]) + // So reallocarray to the rescue + size_t devices_found = 0; + size_t devices_len = 100; +- devices = reallocarray(NULL, devices_len, sizeof(dev_t)); ++ devices = utils_reallocarray(NULL, devices_len, sizeof(dev_t)); + if(!devices) + { + fprintf(stderr, +@@ -354,7 +354,7 @@ main(int argc, char *argv[]) + devices_len *= 2; + if(devices_len <= 0) abort(); + +- devices = reallocarray(devices, devices_len, sizeof(dev_t)); ++ devices = utils_reallocarray(devices, devices_len, sizeof(dev_t)); + + if(!devices) + { +diff --git utils-std-0.1.1/cmd/join.c utils-std-0.1.1/cmd/join.c +index ed93d92..f411a0a 100644 +--- utils-std-0.1.1/cmd/join.c ++++ utils-std-0.1.1/cmd/join.c +@@ -33,12 +33,11 @@ + * SUCH DAMAGE. + */ + +-#define _POSIX_C_SOURCE 202405L + #define _BSD_SOURCE // fgetln, strsep + +-#include "../lib/reallocarray.h" + #include "../libutils/err.h" + #include "../libutils/getopt_nolong.h" ++#include "../libutils/reallocarray.h" + + #include + #include +@@ -304,7 +303,7 @@ slurp(INPUT *F) + cnt = F->setalloc; + F->setalloc += 50; + if(F->setalloc <= 0) utils_errx(1, "slurp setalloc overflow"); +- if((F->set = reallocarray(F->set, F->setalloc, sizeof(LINE))) == NULL) ++ if((F->set = utils_reallocarray(F->set, F->setalloc, sizeof(LINE))) == NULL) + utils_err(1, "Failed (re)allocating slurp set"); + memset(F->set + cnt, 0, 50 * sizeof(LINE)); + +@@ -356,7 +355,7 @@ slurp(INPUT *F) + { + lp->fieldalloc += 50; + if(lp->fieldalloc < 0) utils_errx(1, "slurp fieldalloc overflow"); +- if((lp->fields = reallocarray(lp->fields, lp->fieldalloc, sizeof(char *))) == NULL) ++ if((lp->fields = utils_reallocarray(lp->fields, lp->fieldalloc, sizeof(char *))) == NULL) + utils_err(1, "Failed (re)allocating slurp fieldalloc"); + } + lp->fields[lp->fieldcnt++] = fieldp; +@@ -581,7 +580,7 @@ fieldarg(char *option) + { + olistalloc += 50; + if(olistalloc <= 0) utils_errx(1, "fieldarg olistalloc overflow"); +- if((olist = reallocarray(olist, olistalloc, sizeof(OLIST))) == NULL) ++ if((olist = utils_reallocarray(olist, olistalloc, sizeof(OLIST))) == NULL) + utils_err(1, "Failed (re)allocating fieldarg"); + } + olist[olistcnt].filenum = filenum; +diff --git utils-std-0.1.1/common.mk utils-std-0.1.1/common.mk +index 0b29a48..8d5be14 100644 +--- utils-std-0.1.1/common.mk ++++ utils-std-0.1.1/common.mk +@@ -9,4 +9,4 @@ lib/tr_str.o: lib/tr_str.c lib/tr_str.h + cmd/cat: cmd/cat.c libutils/fs.o libutils/getopt_nolong.o + cmd/printf: cmd/printf.c + cmd/rm: cmd/rm.c libutils/consent.o libutils/getopt_nolong.o +-cmd/tr: cmd/tr.c lib/tr_str.o libutils/err.o libutils/getopt_nolong.o ++cmd/tr: cmd/tr.c lib/tr_str.o libutils/err.o libutils/getopt_nolong.o libutils/reallocarray.o +diff --git utils-std-0.1.1/configure utils-std-0.1.1/configure +index 7ccef56..d9905d2 100755 +--- utils-std-0.1.1/configure ++++ utils-std-0.1.1/configure +@@ -146,14 +146,14 @@ add_commands() { + # when there's 3+ commands starting with the same letter, put them on a new line + commands=" + arch base64 basename +- cat chmod chown chroot cksum cmp date dirname ++ cat chmod chown chroot cksum cmp cut date dirname + echo env expr false getconf head id install link logname + mesg mkdir mkfifo mktemp mv + nice nohup nproc + paste pathchk printf pwd + realpath renice rm rmdir + seq sha1sum sha256sum sha512sum shuf sleep split strings sync +- tee test time timeout touch true truncate tty ++ tee test time timeout touch tr true truncate tty + uname uniq unlink + wc which whoami yes + " +@@ -254,8 +254,7 @@ add_commands() { + + echo + +-check_header mntent.h +-has_mntent_h=$? ++check_header mntent.h && add_commands df + + check_header sys/sysmacros.h && add_commands mknod + +@@ -265,16 +264,13 @@ add_commands() { + check_conftest configure.d/sendfile_linux.c && cpp_define HAS_SENDFILE + check_conftest configure.d/copy_file_range.c && cpp_define HAS_COPY_FILE_RANGE + +-check_conftest configure.d/reallocarray.c +-has_reallocarray=$? +-test 0 -eq $has_reallocarray && add_commands tr cut ++check_conftest configure.d/reallocarray.c && cpp_define HAS_REALLOCARRAY + + check_conftest configure.d/getopt_long.c && cpp_define HAS_GETOPT_LONG + + check_conftest configure.d/syncfs.c && cpp_define HAS_SYNCFS + +-check_conftest configure.d/fgetln.c +-has_fgetln=$? ++check_conftest configure.d/fgetln.c && add_commands join + + check_conftest configure.d/mkstemps.c && cpp_define HAS_MKSTEMPS + check_conftest configure.d/mkdtemps.c && cpp_define HAS_MKDTEMPS +@@ -288,13 +284,6 @@ add_commands() { + + echo + +-if test 0 -eq $has_reallocarray; then +- test 0 -eq $has_mntent_h && add_commands df +- test 0 -eq $has_fgetln && add_commands join +-fi +- +-echo +- + ## Configuration write + + printf 'Writing to config.mk ...' +diff --git utils-std-0.1.1/configure.d/reallocarray.c utils-std-0.1.1/configure.d/reallocarray.c +index 022df8f..426a6ce 100644 +--- utils-std-0.1.1/configure.d/reallocarray.c ++++ utils-std-0.1.1/configure.d/reallocarray.c +@@ -3,8 +3,7 @@ + // SPDX-License-Identifier: MPL-2.0 + + #define _POSIX_C_SOURCE 202405L +- +-#include "../lib/reallocarray.h" ++#define _BSD_SOURCE + + #include // reallocarray + +diff --git utils-std-0.1.1/lib/reallocarray.h utils-std-0.1.1/lib/reallocarray.h +deleted file mode 100644 +index 2d91abd..0000000 +--- utils-std-0.1.1/lib/reallocarray.h ++++ /dev/null +@@ -1,19 +0,0 @@ +-// utils-std: Collection of commonly available Unix tools +-// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier +-// SPDX-License-Identifier: 0BSD +- +-#if !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 202405L +-#error reallocarray needs: define _POSIX_C_SOURCE 202405L +-#endif +- +-// pre-POSIX.1-2024 reallocarray fallback +-#if !defined(_POSIX_VERSION) || _POSIX_VERSION < 202405L +-#define _BSD_SOURCE +-// FreeBSD +-#undef _POSIX_C_SOURCE +-#if __NetBSD_Version__ < 1000000000 +-#define _OPENBSD_SOURCE +-#endif +-#endif +- +-#include // reallocarray +diff --git utils-std-0.1.1/lib/tr_str.c utils-std-0.1.1/lib/tr_str.c +index 23dfcab..7cb14b9 100644 +--- utils-std-0.1.1/lib/tr_str.c ++++ utils-std-0.1.1/lib/tr_str.c +@@ -31,15 +31,12 @@ + * SUCH DAMAGE. + */ + +-// clang-format off + #define _POSIX_C_SOURCE 202405L +-// Needs to be the first included header due to this horrible BSD_VISIBLE macro +-#include "./reallocarray.h" + + #include "./tr_str.h" +-// clang-format on + + #include "../libutils/err.h" ++#include "../libutils/reallocarray.h" + + #include + #include +@@ -190,7 +187,7 @@ genclass(STR *s) + { + len = NCHARS + 1; + assert(len != 0); +- cp->set = reallocarray(NULL, len, sizeof(*cp->set)); ++ cp->set = utils_reallocarray(NULL, len, sizeof(*cp->set)); + if(cp->set == NULL) utils_err(1, NULL); + + len = 0; +@@ -201,7 +198,7 @@ genclass(STR *s) + cp->set[len++] = OOBCH; + + assert(len != 0); +- cp->set = reallocarray(cp->set, len, sizeof(*cp->set)); ++ cp->set = utils_reallocarray(cp->set, len, sizeof(*cp->set)); + if(cp->set == NULL) utils_err(1, NULL); + } + +diff --git utils-std-0.1.1/libutils/reallocarray.c utils-std-0.1.1/libutils/reallocarray.c +new file mode 100644 +index 0000000..14b4fd8 +--- /dev/null ++++ utils-std-0.1.1/libutils/reallocarray.c +@@ -0,0 +1,30 @@ ++// Copied from musl ++// Copyright © 2020 Ariadne Conill ++// SPDX-License-Identifier: MIT ++ ++#define _POSIX_C_SOURCE 202405L ++#define _BSD_SOURCE ++#include "./reallocarray.h" ++ ++#include ++#include ++ ++#ifdef HAS_REALLOCARRAY ++void * ++utils_reallocarray(void *ptr, size_t m, size_t n) ++{ ++ return reallocarray(ptr, m, n); ++} ++#else /* HAS_REALLOCARRAY */ ++void * ++utils_reallocarray(void *ptr, size_t m, size_t n) ++{ ++ if(n && m > -1 / n) ++ { ++ errno = ENOMEM; ++ return 0; ++ } ++ ++ return realloc(ptr, m * n); ++} ++#endif +diff --git utils-std-0.1.1/libutils/reallocarray.h utils-std-0.1.1/libutils/reallocarray.h +new file mode 100644 +index 0000000..dcafb1e +--- /dev/null ++++ utils-std-0.1.1/libutils/reallocarray.h +@@ -0,0 +1,13 @@ ++// utils-std: Collection of commonly available Unix tools ++// SPDX-FileCopyrightText: 2017 Haelwenn (lanodan) Monnier ++// SPDX-License-Identifier: 0BSD ++ ++#ifndef _BSD_SOURCE ++# if !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 202405L ++# error reallocarray needs: define _POSIX_C_SOURCE 202405L or define _BSD_SOURCE ++# endif ++#endif ++ ++#include // reallocarray ++ ++void *utils_reallocarray(void *ptr, size_t m, size_t n); From 9fb6322a3793f00ef8d814a4f0a1d62da81f943c Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 14 Feb 2026 17:00:04 +0100 Subject: [PATCH 7/8] steps/utils-std-0.1.1: toss out which(1) --- steps/SHA256SUMS.pkgs | 2 +- steps/utils-std-0.1.1/pass1.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index 8e9a765c..d16f2291 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -148,7 +148,7 @@ ab49972345d0c05f79b9370530829792e8c5c3b7fe283fc90e1dff26c2d0f6db tcc-0.9.27_2.t 8576a7c99802bb462dd044ef7df7263192f1acfabde47462afd6145ffec1e4f1 tcc-0.9.27_3.tar.bz2 252cc7226bef56e9dc591433ab2176cf1dd54dd18de20535edb708d5c6c21dce texinfo-7.2_0.tar.bz2 b54b1aa40dc08eec51982fd581a64a900e2598ba29acc6ca9c2b1b2321603b49 util-linux-2.19.1_0.tar.bz2 -e56eb357986fea273309e72f2faa2b86da492e104ab216014d1b76526e242346 utils-std-0.1.1_0.tar.bz2 +5795e8701aa957cbb000aa7b883d3cb770d152a6e7ab30054b4062a67ecc9c0b utils-std-0.1.1_0.tar.bz2 9075b6832d8d7b094775c8e6ead763851aec96f4559d8cd62ce0a25e7a8a70ab which-2.21_0.tar.bz2 d7357c5a73e4a0adb07220392316185716c42003fe7e63b63ba8493f12f3621b xz-5.6.4_0.tar.bz2 9b10db90e06129fd174d48edb60a6d1e2fa72944fccef420431f8e836adcf972 zlib-1.3.1_0.tar.bz2 diff --git a/steps/utils-std-0.1.1/pass1.sh b/steps/utils-std-0.1.1/pass1.sh index 512764b1..bc464328 100644 --- a/steps/utils-std-0.1.1/pass1.sh +++ b/steps/utils-std-0.1.1/pass1.sh @@ -7,8 +7,9 @@ src_prepare() { sed -i s/_Noreturn// libutils/err.h - # to avoid changing libtool checksums, although likely means better values - sed -i '/^commands="$/,/^"$/'s,getconf,, configure + # getconf: to avoid changing libtool checksums, although likely means better values + # which: to avoid changing checksums of packages like perl-5.36.3_0 + sed -i '/^commands="$/,/^"$/{ s,getconf,, ; s,which,, }' configure } src_configure() { From 2f75ecf14212b91f7f30bb38c70c653d5a571c8b Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Sat, 14 Feb 2026 19:53:43 +0100 Subject: [PATCH 8/8] steps/SHA256SUMS.pkgs: update gettext-0.26_0.tar.bz2 checksum Only difference is javaversion.class getting properly removed. --- steps/SHA256SUMS.pkgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs index d16f2291..c066cc55 100644 --- a/steps/SHA256SUMS.pkgs +++ b/steps/SHA256SUMS.pkgs @@ -57,7 +57,7 @@ b4fafdabdbd8c1f9f7c96fc4677023a8151fe2afe0702e3dee920157b30deb98 gc-8.0.4_0.tar d34de902de6de9204abedb834c4c39fbb95b993e545fbb090de2b028fa1d4a61 gcc-4.0.4_0.tar.bz2 2f13b3306832d882536c97d0302f2ec1801193086dbbe62388f930858e5728a3 gcc-4.0.4_1.tar.bz2 931f105104b446dff5be30927e6e98d798844e6cd446b246f30def11984a9587 gcc-4.7.4_0.tar.bz2 -38b015fe07ed755377b78f8ac8815d8bb57fa8c79293110522231250a6ad8a6f gettext-0.26_0.tar.bz2 +657d077d52e945aa0de47dc94295c9aae1c9dfb2c12e96f4e3dee6d067009c8c gettext-0.26_0.tar.bz2 96f33b53c24f5f46a23c2b9eef8147e684c796889a83bdd39254a73393594a49 gmp-6.2.1_0.tar.bz2 061bb98da6364ea67c4c1a515ffe06296b4dea045ba3d1b5e229416103f50688 gperf-3.3_0.tar.bz2 c1989fc2855dbb0350c4e5b677028306614a9f4b5cb6c01fd459c5e1abf592b9 grep-2.4_0.tar.bz2