From 734988334a9a483643b8ac77a60097bd47383294 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus@seznam.cz>
Date: Thu, 3 Oct 2024 00:00:09 +0200
Subject: [PATCH] Fix wrapper to hide password from process history

---
 p7zip-015-hide-passwd.patch | 12 ++++++++++++
 p7zip.spec                  |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 p7zip-015-hide-passwd.patch

diff --git a/p7zip-015-hide-passwd.patch b/p7zip-015-hide-passwd.patch
new file mode 100644
index 0000000..7b865df
--- /dev/null
+++ b/p7zip-015-hide-passwd.patch
@@ -0,0 +1,12 @@
+diff -ru p7zip_16.02.old/install.sh p7zip_16.02.new/install.sh
+--- p7zip_16.02.old/install.sh	2015-10-05 10:39:00.000000000 +0200
++++ p7zip_16.02.new/install.sh	2024-10-02 18:47:30.746978319 +0200
+@@ -10,7 +10,7 @@
+     chmod 755 "${DEST_DIR}${DEST_SHARE}/${prg}"
+     strip     "${DEST_DIR}${DEST_SHARE}/${prg}"
+     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/${prg}"
+-    echo "\"${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}"
++    echo "exec \"${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}"
+     chmod 755 "${DEST_DIR}${DEST_BIN}/${prg}"
+   fi
+ }
diff --git a/p7zip.spec b/p7zip.spec
index 2594fa0..1a45a9e 100644
--- a/p7zip.spec
+++ b/p7zip.spec
@@ -7,7 +7,7 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
 Version: 16.02
-Release: 30%{?dist}
+Release: 31%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 # Automatically converted from old format: LGPLv2 and (LGPLv2+ or CPL) - review is highly recommended.
 License: LicenseRef-Callaway-LGPLv2 AND (LicenseRef-Callaway-LGPLv2+ OR CPL-1.0)
@@ -33,6 +33,10 @@ Patch12: gcc10-conversion.patch
 Patch13: 0001-fix-data-null-pointer.patch
 Patch14: 0001-fix-out-of-mem.patch
 
+# Issue with hiding the password from the process history
+# reported to upstream https://sourceforge.net/p/p7zip/patches/38/
+Patch15: p7zip-015-hide-passwd.patch
+
 BuildRequires: make
 BuildRequires: gcc-c++
 BuildRequires: cmake
@@ -176,6 +180,9 @@ make test
 
 
 %changelog
+* Fri Oct 04 2024 Sérgio Basto <sergio@serjux.com> - 16.02-31
+- Fix wrapper to hide password from process history
+
 * Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 16.02-30
 - convert license to SPDX