From 3c4b5d2ab125494baa7e1d275993cbf4d272b98d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Sat, 5 Oct 2024 01:34:54 +0300 Subject: [PATCH] import p7zip-16.02-31.el8 --- SOURCES/p7zip-015-hide-passwd.patch | 12 +++++++ SPECS/p7zip.spec | 56 +++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 SOURCES/p7zip-015-hide-passwd.patch diff --git a/SOURCES/p7zip-015-hide-passwd.patch b/SOURCES/p7zip-015-hide-passwd.patch new file mode 100644 index 0000000..7b865df --- /dev/null +++ b/SOURCES/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/SPECS/p7zip.spec b/SPECS/p7zip.spec index 00e67da..6c7e1b6 100644 --- a/SPECS/p7zip.spec +++ b/SPECS/p7zip.spec @@ -7,9 +7,10 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 20%{?dist} +Release: 31%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL -License: LGPLv2 and (LGPLv2+ 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) URL: http://p7zip.sourceforge.net/ # RAR sources removed since their license is incompatible with the LGPL #Source: http://downloads.sf.net/p7zip/p7zip_%%{version}_src_all.tar.bz2 @@ -32,17 +33,16 @@ 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 BuildRequires: gcc-c++ BuildRequires: cmake %if %{with gui} # for 7zG GUI -%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: wxGTK-devel -%else -BuildRequires: wxGTK3-devel -%endif BuildRequires: kde-filesystem %endif %ifarch %{ix86} @@ -128,10 +128,10 @@ mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip rmdir %{buildroot}%{_docdir}/p7zip/DOC/ %if %{with gui} -mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ +mkdir -p %{buildroot}%{_datadir}/kservices5/ # remove a duplicated of p7zip_compress.desktop rm GUI/kde4/p7zip_compress2.desktop -cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ +cp GUI/kde4/*.desktop %{buildroot}%{_datadir}/kservices5/ #fix non-executable-in-bin chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %endif @@ -171,7 +171,7 @@ make test %{_bindir}/p7zipForFilemanager %{_libexecdir}/p7zip/7zG %{_libexecdir}/p7zip/Lang -%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop +%{_datadir}/kservices5/*.desktop %endif %files doc @@ -180,9 +180,43 @@ make test %changelog -* Wed Mar 20 2024 MSVSphere Packaging Team - 16.02-20 +* Fri Oct 04 2024 Sérgio Basto - 16.02-31 +- Fix wrapper to hide password from process history + +* Wed Sep 04 2024 Miroslav Suchý - 16.02-30 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 16.02-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Mar 20 2024 MSVSphere Packaging Team - 16.02-28 - Rebuilt for MSVSphere 8.9 +* Thu Jan 25 2024 Fedora Release Engineering - 16.02-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +- Fix the build by moving desktop files from kde4/services/ServiceMenus/ to kservices5 + +* Sun Jan 21 2024 Fedora Release Engineering - 16.02-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 16.02-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 16.02-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Aug 04 2022 Scott Talbert - 16.02-24 +- Rebuild with wxWidgets 3.2 + +* Fri Jul 22 2022 Fedora Release Engineering - 16.02-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 16.02-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 16.02-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Apr 22 2021 Sérgio Basto - 16.02-20 - Fix two Null Pointer Dereferences, thanks to NSFOCUS Security Team