Received: by mail.netbsd.org (Postfix, from userid 605) id 47BEB84E9B; Mon, 22 Jan 2024 11:00:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7368284E90 for ; Mon, 22 Jan 2024 11:00:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FQWDnMdvdSGt for ; Mon, 22 Jan 2024 11:00:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A15EB84D2E for ; Mon, 22 Jan 2024 11:00:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 94B18FA42; Mon, 22 Jan 2024 11:00:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1705921216205790" MIME-Version: 1.0 Date: Mon, 22 Jan 2024 11:00:16 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20240122110016.94B18FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1705921216205790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Jan 22 11:00:16 UTC 2024 Modified Files: pkgsrc/lang/rust: distinfo pkgsrc/lang/rust/patches: patch-src_tools_rust-installer_install-template.sh Log Message: rust: avoid .old files in the final package To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 pkgsrc/lang/rust/distinfo cvs rdiff -u -r1.11 -r1.12 \ pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1705921216205790 Content-Disposition: inline Content-Length: 4138 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/distinfo diff -u pkgsrc/lang/rust/distinfo:1.165 pkgsrc/lang/rust/distinfo:1.166 --- pkgsrc/lang/rust/distinfo:1.165 Sat Jan 6 19:00:19 2024 +++ pkgsrc/lang/rust/distinfo Mon Jan 22 11:00:16 2024 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.165 2024/01/06 19:00:19 he Exp $ +$NetBSD: distinfo,v 1.166 2024/01/22 11:00:16 adam Exp $ BLAKE2s (rust-1.73.0-aarch64-apple-darwin.tar.gz) = 6d789c5a388ba8db0d1eb906187fc57415cfe7c91fc20a75f051f944d9efc2c6 SHA512 (rust-1.73.0-aarch64-apple-darwin.tar.gz) = 6c7093851069584312228c39f7f2ec67739278afd776ba4194684ec27dd523676acf4d97bc7ae662e50f3d0d955c31f356502bf6cd5aebe4f76b0b89a3b202c3 @@ -139,7 +139,7 @@ SHA1 (patch-src_llvm-project_llvm_lib_Su SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = e1af7fde97416e0a269ee34efd37f4f47fcf7a95 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906 -SHA1 (patch-src_tools_rust-installer_install-template.sh) = 28fbfd37793c8438a603cb0e19483bd5b9138e4b +SHA1 (patch-src_tools_rust-installer_install-template.sh) = 8ad07786eab74fa23890d16520123e3a36f67d7b SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153 SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80 SHA1 (patch-vendor_cc-1.0.73_src_lib.rs) = 98acea9fb98898f63bbb0f6555df5e4b15da2b85 Index: pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh diff -u pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh:1.11 pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh:1.12 --- pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh:1.11 Wed Oct 25 05:50:43 2023 +++ pkgsrc/lang/rust/patches/patch-src_tools_rust-installer_install-template.sh Mon Jan 22 11:00:16 2024 @@ -1,14 +1,15 @@ -$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.11 2023/10/25 05:50:43 pin Exp $ +$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.12 2024/01/22 11:00:16 adam Exp $ No logging to 'install.log'. Do not create 'uninstall.sh'. +Do not make file backups (filename.old), so these will not end up in the final package. Rewrite to not use a whole lot of subprocesses just for doing pattern matching and substitution in the install phase using "grep" and "sed" when shell builtin "case" and "omit shortest match" ops should do just fine. ---- src/tools/rust-installer/install-template.sh.orig 2021-05-09 02:52:58.000000000 +0000 +--- src/tools/rust-installer/install-template.sh.orig 2023-12-04 19:48:34.000000000 +0000 +++ src/tools/rust-installer/install-template.sh @@ -6,20 +6,12 @@ set -u init_logging() { @@ -134,10 +135,12 @@ should do just fine. # Make sure there's a directory for it make_dir_recursive "$(dirname "$_file_install_path")" -@@ -617,14 +600,16 @@ install_components() { +@@ -615,16 +598,16 @@ install_components() { - maybe_backup_path "$_file_install_path" + verbose_msg "copying file $_file_install_path" +- maybe_backup_path "$_file_install_path" +- - if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file" - then - run cp "$_src_dir/$_component/$_file" "$_file_install_path" @@ -158,7 +161,15 @@ should do just fine. critical_need_ok "file creation failed" # Update the manifest -@@ -986,7 +971,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_ +@@ -637,7 +620,6 @@ install_components() { + + verbose_msg "copying directory $_file_install_path" + +- maybe_backup_path "$_file_install_path" + + run cp -R "$_src_dir/$_component/$_file" "$_file_install_path" + critical_need_ok "failed to copy directory" +@@ -986,7 +968,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_ critical_need_ok "failed to write installer version" # Install the uninstaller --_----------=_1705921216205790--