From 1cd4af850aa3e1398e14ad96ee77af1d13ee4b8c Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 19 Apr 2005 14:57:01 +0000 Subject: [PATCH 01/86] auto-import p7zip-4.16-1 on branch devel from p7zip-4.16-1.src.rpm --- .cvsignore | 1 + p7zip.spec | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 128 insertions(+) create mode 100644 p7zip.spec diff --git a/.cvsignore b/.cvsignore index e69de29..69de8bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +p7zip_4.16_src.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec new file mode 100644 index 0000000..cb6bf54 --- /dev/null +++ b/p7zip.spec @@ -0,0 +1,126 @@ +Summary: Very high compression ratio file archiver +Name: p7zip +Version: 4.16 +Release: 1 +License: LGPL +Group: Applications/Archiving +URL: http://p7zip.sourceforge.net/ +Source: http://dl.sf.net/p7zip/p7zip_%{version}_src.tar.bz2 +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: gcc-c++ + +%description +p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high +compression ratio. The original version can be found at http://www.7-zip.org/. + + +%package plugins +Summary: Additional plugins for p7zip +Group: Applications/Archiving +Requires: %{name} = %{version} + +%description plugins +Additional plugins that can be used with 7z to extend its abilities. +This package contains also a virtual file system for Midnight Commander. + + +%prep +%setup -n %{name}_%{version} + +# Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the +# same directory as the binaries, and we don't want them in %{_bindir}. +%{__cat} << 'EOF' > 7za.sh +#!/bin/sh +exec %{_libexecdir}/p7zip/7za $@ +EOF + +%{__cat} << 'EOF' > 7z.sh +#!/bin/sh +exec %{_libexecdir}/p7zip/7z $@ +EOF + +%build +%ifarch %{ix86} ppc +%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%endif +%ifarch x86_64 +%{__cp} -f makefile.linux_amd64 makefile.machine +%endif + +# Use optflags +%{__perl} -pi -e 's|^ALLFLAGS=.*|ALLFLAGS=-Wall %{optflags} -fPIC \\|g' \ + makefile.machine +%{__make} %{?_smp_mflags} 7z 7za sfx + + +%install +%{__rm} -rf %{buildroot} + +# Install binaries (7za, 7z, 7zCon.sfx and Codecs/Formats) +%{__mkdir_p} %{buildroot}%{_libexecdir}/p7zip/ +%{__cp} -a bin/* %{buildroot}%{_libexecdir}/p7zip/ + +# Install wrapper scripts +%{__install} -D -m 0755 7z.sh %{buildroot}%{_bindir}/7z +%{__install} -D -m 0755 7za.sh %{buildroot}%{_bindir}/7za + + +%clean +%{__rm} -rf %{buildroot} + + +%files +%defattr(-, root, root, 0755) +%doc ChangeLog README TODO DOCS/* +%{_bindir}/7za +%dir %{_libexecdir}/p7zip/ +%{_libexecdir}/p7zip/7za +%{_libexecdir}/p7zip/7zCon.sfx + +%files plugins +%defattr(-, root, root, 0755) +%doc contrib/ +%{_bindir}/7z +%{_libexecdir}/p7zip/7z +%{_libexecdir}/p7zip/Codecs/ +%{_libexecdir}/p7zip/Formats/ + + +%changelog +* Sun Apr 10 2005 Dag Wieers - 4.16-1 +- Moved inline scripts to %%prep stage. +- Removed quotes for $@ as it should not be necessary. + +* Thu Mar 17 2005 Matthias Saou 4.14.01-1 +- Spec file cleanup. +- Fix wrapper scripts : Double quote $@ for filenames with spaces to work. +- Move files from /usr/share to /usr/libexec. +- Various other minor changes. + +* Mon Jan 24 2005 Marcin Zajączkowski + - upgraded to 4.14.01 + +* Sun Jan 16 2005 Marcin Zajączkowski + - upgraded to 4.14 + +* Mon Dec 20 2004 Marcin Zajączkowski + - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z + use it simultaneously + - returned to plugins in separate package + +* Sat Dec 18 2004 Charles Duffy + - upgraded to 4.13 + - added 7z (not just 7za) with a shell wrapper + - added gcc-c++ to the BuildRequires list + +* Sat Nov 20 2004 Marcin Zajączkowski + - upgraded to 4.12 + - added virtual file system for Midnight Commander + +* Thu Nov 11 2004 Marcin Zajączkowski + - upgraded to 4.10 + - plugins support was dropped out from p7zip + +* Sun Aug 29 2004 Marcin Zajączkowski + - initial release + diff --git a/sources b/sources index e69de29..885a482 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +e307fc7f145f3a62ac2cb9f484d58b0b p7zip_4.16_src.tar.bz2 From 47f2cadaab4b1f6297fe59b4cbed33ae0b647632 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 5 Jun 2005 21:14:16 +0000 Subject: [PATCH 02/86] Update to 4.20. --- .cvsignore | 2 +- p7zip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 69de8bc..253234c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.16_src.tar.bz2 +p7zip_4.20_src.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index cb6bf54..80c8784 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.16 -Release: 1 +Version: 4.20 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -87,6 +87,9 @@ EOF %changelog +* Sun Jun 05 2005 Dag Wieers - 4.20-1 +- Updated to release 4.20. + * Sun Apr 10 2005 Dag Wieers - 4.16-1 - Moved inline scripts to %%prep stage. - Removed quotes for $@ as it should not be necessary. diff --git a/sources b/sources index 885a482..38f6261 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e307fc7f145f3a62ac2cb9f484d58b0b p7zip_4.16_src.tar.bz2 +91abf73ddfc92a0ed87dd5bb9fc3a38d p7zip_4.20_src.tar.bz2 From a5ba3dabae95cbeca20343febdf920cf3c9dabb4 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 20 Jul 2005 22:27:49 +0000 Subject: [PATCH 03/86] Convert spec files to UTF-8 (and find out what the aogon is!). --- p7zip.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 80c8784..80554ed 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -100,13 +100,13 @@ EOF - Move files from /usr/share to /usr/libexec. - Various other minor changes. -* Mon Jan 24 2005 Marcin Zajączkowski +* Mon Jan 24 2005 Marcin Zajączkowski - upgraded to 4.14.01 -* Sun Jan 16 2005 Marcin Zajączkowski +* Sun Jan 16 2005 Marcin Zajączkowski - upgraded to 4.14 -* Mon Dec 20 2004 Marcin Zajączkowski +* Mon Dec 20 2004 Marcin Zajączkowski - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z use it simultaneously - returned to plugins in separate package @@ -116,14 +116,14 @@ EOF - added 7z (not just 7za) with a shell wrapper - added gcc-c++ to the BuildRequires list -* Sat Nov 20 2004 Marcin Zajączkowski +* Sat Nov 20 2004 Marcin Zajączkowski - upgraded to 4.12 - added virtual file system for Midnight Commander -* Thu Nov 11 2004 Marcin Zajączkowski +* Thu Nov 11 2004 Marcin Zajączkowski - upgraded to 4.10 - plugins support was dropped out from p7zip -* Sun Aug 29 2004 Marcin Zajączkowski +* Sun Aug 29 2004 Marcin Zajączkowski - initial release From 99fb34995173d552d2350f8f0906155a4399de11 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 10 Oct 2005 21:40:27 +0000 Subject: [PATCH 04/86] Update to 4.29. --- p7zip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 80554ed..af39301 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,11 +1,11 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.20 +Version: 4.29 Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src.tar.bz2 +Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++ @@ -87,6 +87,9 @@ EOF %changelog +* Mon Oct 10 2005 Matthias Saou 4.29-1 +- Update to 4.29. + * Sun Jun 05 2005 Dag Wieers - 4.20-1 - Updated to release 4.20. From 2b5a680eb8ba50d95c8b1f328a6533f409c4bcf5 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 11 Oct 2005 10:30:22 +0000 Subject: [PATCH 05/86] Fix missed source update. --- .cvsignore | 2 +- p7zip.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 253234c..8813c84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.20_src.tar.bz2 +p7zip_4.29_src_all.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index af39301..57b4716 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.29 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -87,7 +87,7 @@ EOF %changelog -* Mon Oct 10 2005 Matthias Saou 4.29-1 +* Mon Oct 10 2005 Matthias Saou 4.29-2 - Update to 4.29. * Sun Jun 05 2005 Dag Wieers - 4.20-1 diff --git a/sources b/sources index 38f6261..709f5ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91abf73ddfc92a0ed87dd5bb9fc3a38d p7zip_4.20_src.tar.bz2 +1ea12d7e91c9c67fb6512a6a144b8431 p7zip_4.29_src_all.tar.bz2 From e5919d057dcfe89050ecad36f6a164a5fed224ec Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 27 Oct 2005 16:45:20 +0000 Subject: [PATCH 06/86] Double quote args passed inside the shell scripts, to fix #171480. --- p7zip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 57b4716..fd6754c 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.29 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -31,12 +31,12 @@ This package contains also a virtual file system for Midnight Commander. # same directory as the binaries, and we don't want them in %{_bindir}. %{__cat} << 'EOF' > 7za.sh #!/bin/sh -exec %{_libexecdir}/p7zip/7za $@ +exec %{_libexecdir}/p7zip/7za "$@" EOF %{__cat} << 'EOF' > 7z.sh #!/bin/sh -exec %{_libexecdir}/p7zip/7z $@ +exec %{_libexecdir}/p7zip/7z "$@" EOF %build @@ -87,6 +87,9 @@ EOF %changelog +* Thu Oct 27 2005 Matthias Saou 4.29-3 +- Double quote args passed inside the shell scripts, to fix #171480. + * Mon Oct 10 2005 Matthias Saou 4.29-2 - Update to 4.29. From a7e620591edcc5613a759ddc25d52bf4a4a9c764 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 28 Nov 2005 15:09:10 +0000 Subject: [PATCH 07/86] Update to 4.30. --- .cvsignore | 2 +- p7zip.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8813c84..ad852b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.29_src_all.tar.bz2 +p7zip_4.30_src_all.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index fd6754c..3a13c55 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.29 -Release: 3%{?dist} +Version: 4.30 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -39,6 +39,7 @@ EOF exec %{_libexecdir}/p7zip/7z "$@" EOF + %build %ifarch %{ix86} ppc %{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine @@ -87,6 +88,9 @@ EOF %changelog +* Mon Nov 28 2005 Matthias Saou 4.30-1 +- Update to 4.30. + * Thu Oct 27 2005 Matthias Saou 4.29-3 - Double quote args passed inside the shell scripts, to fix #171480. diff --git a/sources b/sources index 709f5ea..895820f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ea12d7e91c9c67fb6512a6a144b8431 p7zip_4.29_src_all.tar.bz2 +cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 From e39645f682a96fec8a9904239e86f521d4cb1418 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 9 Feb 2006 16:49:43 +0000 Subject: [PATCH 08/86] Rebuild for new gcc/glibc. --- p7zip.spec | 8 +++- p7zip_4.30-extraqualif.patch | 91 ++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 p7zip_4.30-extraqualif.patch diff --git a/p7zip.spec b/p7zip.spec index 3a13c55..1dfa4b5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,11 +1,12 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.30 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +Patch0: p7zip_4.30-extraqualif.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++ @@ -26,6 +27,7 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -n %{name}_%{version} +%patch0 -p1 -b .extraqualif # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -88,6 +90,10 @@ EOF %changelog +* Thu Feb 9 2006 Matthias Saou 4.30-2 +- Rebuild for new gcc/glibc. +- Include gcc 4.1 patch for extra qualification errors. + * Mon Nov 28 2005 Matthias Saou 4.30-1 - Update to 4.30. diff --git a/p7zip_4.30-extraqualif.patch b/p7zip_4.30-extraqualif.patch new file mode 100644 index 0000000..19de197 --- /dev/null +++ b/p7zip_4.30-extraqualif.patch @@ -0,0 +1,91 @@ +diff -Naupr p7zip_4.30.orig/7zip/Archive/7z/7zIn.h p7zip_4.30/7zip/Archive/7z/7zIn.h +--- p7zip_4.30.orig/7zip/Archive/7z/7zIn.h 2005-09-22 19:53:23.000000000 +0200 ++++ p7zip_4.30/7zip/Archive/7z/7zIn.h 2006-02-09 17:25:37.000000000 +0100 +@@ -244,7 +244,7 @@ private: + CRecordVector &digestsDefined, + CRecordVector &digests); + +- HRESULT CInArchive::ReadStreamsInfo( ++ HRESULT ReadStreamsInfo( + const CObjectVector *dataVector, + UInt64 &dataOffset, + CRecordVector &packSizes, +diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h +--- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h 2005-09-22 19:53:21.000000000 +0200 ++++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h 2006-02-09 17:30:32.000000000 +0100 +@@ -58,7 +58,7 @@ class CCoder : + UInt32 c_table[CTABLESIZE]; + UInt32 pt_table[PTABLESIZE]; + +- void CCoder::ReleaseStreams() ++ void ReleaseStreams() + { + m_OutWindowStream.ReleaseStream(); + m_InBitStream.ReleaseStream(); +diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h +--- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h 2005-09-22 19:53:21.000000000 +0200 ++++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h 2006-02-09 17:27:38.000000000 +0100 +@@ -26,7 +26,7 @@ class CCoder : + CLZOutWindow m_OutWindowStream; + NStream::NMSBF::CDecoder m_InBitStream; + +- void CCoder::ReleaseStreams() ++ void ReleaseStreams() + { + m_OutWindowStream.ReleaseStream(); + m_InBitStream.ReleaseStream(); +@@ -62,4 +62,4 @@ public: + + }}} + +-#endif +\ No newline at end of file ++#endif +diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h +--- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h 2005-09-22 19:53:20.000000000 +0200 ++++ p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h 2006-02-09 17:23:19.000000000 +0100 +@@ -60,7 +60,7 @@ class CCoder: + void DeCodeLevelTable(Byte *newLevels, int numLevels); + bool ReadTables(); + +- void CCoder::ReleaseStreams() ++ void ReleaseStreams() + { + m_OutWindowStream.ReleaseStream(); + ReleaseInStream(); +diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h +--- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h 2005-11-19 22:09:02.000000000 +0100 ++++ p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h 2006-02-09 17:32:27.000000000 +0100 +@@ -115,7 +115,7 @@ class CCoder + void CopyBackBlockOp(UInt32 distance, UInt32 length); + void WriteBlockData(bool writeMode, bool finalBlock); + +- void CCoder::ReleaseStreams() ++ void ReleaseStreams() + { + // m_MatchFinder.ReleaseStream(); + m_OutStream.ReleaseStream(); +diff -Naupr p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h +--- p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h 2005-09-22 19:53:21.000000000 +0200 ++++ p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h 2006-02-09 17:37:56.000000000 +0100 +@@ -53,7 +53,7 @@ class CCoder : + CHuffmanDecoder m_PHuffmanDecoder; + CHuffmanDecoder m_CHuffmanDecoder; + +- void CCoder::ReleaseStreams() ++ void ReleaseStreams() + { + m_OutWindowStream.ReleaseStream(); + m_InBitStream.ReleaseStream(); +diff -Naupr p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h +--- p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h 2005-09-22 19:53:22.000000000 +0200 ++++ p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h 2006-02-09 17:20:16.000000000 +0100 +@@ -52,7 +52,7 @@ public: + + CStdOutStream *OutStream; + +- void CExtractCallbackConsole::Init() ++ void Init() + { + NumArchives = 0; + NumArchiveErrors = 0; From 7b15b4cf97811e8f9d2e701c8bfaa93a9c0ffc61 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 6 Mar 2006 15:20:37 +0000 Subject: [PATCH 09/86] FC5 rebuild. --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 1dfa4b5..ad97710 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.30 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -90,6 +90,9 @@ EOF %changelog +* Mon Mar 6 2006 Matthias Saou 4.30-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.30-2 - Rebuild for new gcc/glibc. - Include gcc 4.1 patch for extra qualification errors. From b95b5a0811a197a96043373e1ae9b3ad9745e699 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 2 May 2006 09:52:14 +0000 Subject: [PATCH 10/86] Update to 4.39 and remove all Rar-related files since their license is not acceptable for inclusion in Fedora. --- .cvsignore | 2 +- p7zip.spec | 24 +++++++--- p7zip_4.30-extraqualif.patch | 91 ------------------------------------ sources | 2 +- 4 files changed, 19 insertions(+), 100 deletions(-) delete mode 100644 p7zip_4.30-extraqualif.patch diff --git a/.cvsignore b/.cvsignore index ad852b6..e0e0344 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.30_src_all.tar.bz2 +p7zip_4.39_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index ad97710..e4256d5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,14 +1,19 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.30 -Release: 3%{?dist} +Version: 4.39 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ -Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 -Patch0: p7zip_4.30-extraqualif.patch +# RAR sources removed since their license is incompatible with the LGPL +#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +# VERSION= +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gcc-c++ %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -27,7 +32,6 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -n %{name}_%{version} -%patch0 -p1 -b .extraqualif # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -44,7 +48,7 @@ EOF %build %ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine +%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64 makefile.machine @@ -90,6 +94,12 @@ EOF %changelog +* Tue May 2 2006 Matthias Saou 4.39-1 +- Update to 4.39. +- Remove no longer needed gcc 4.1 patch. +- Use the gcc_4.X makefile. +- Remove RAR licensed files and RAR license itself (#190277). + * Mon Mar 6 2006 Matthias Saou 4.30-3 - FC5 rebuild. diff --git a/p7zip_4.30-extraqualif.patch b/p7zip_4.30-extraqualif.patch deleted file mode 100644 index 19de197..0000000 --- a/p7zip_4.30-extraqualif.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -Naupr p7zip_4.30.orig/7zip/Archive/7z/7zIn.h p7zip_4.30/7zip/Archive/7z/7zIn.h ---- p7zip_4.30.orig/7zip/Archive/7z/7zIn.h 2005-09-22 19:53:23.000000000 +0200 -+++ p7zip_4.30/7zip/Archive/7z/7zIn.h 2006-02-09 17:25:37.000000000 +0100 -@@ -244,7 +244,7 @@ private: - CRecordVector &digestsDefined, - CRecordVector &digests); - -- HRESULT CInArchive::ReadStreamsInfo( -+ HRESULT ReadStreamsInfo( - const CObjectVector *dataVector, - UInt64 &dataOffset, - CRecordVector &packSizes, -diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h ---- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h 2005-09-22 19:53:21.000000000 +0200 -+++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h 2006-02-09 17:30:32.000000000 +0100 -@@ -58,7 +58,7 @@ class CCoder : - UInt32 c_table[CTABLESIZE]; - UInt32 pt_table[PTABLESIZE]; - -- void CCoder::ReleaseStreams() -+ void ReleaseStreams() - { - m_OutWindowStream.ReleaseStream(); - m_InBitStream.ReleaseStream(); -diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h ---- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h 2005-09-22 19:53:21.000000000 +0200 -+++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h 2006-02-09 17:27:38.000000000 +0100 -@@ -26,7 +26,7 @@ class CCoder : - CLZOutWindow m_OutWindowStream; - NStream::NMSBF::CDecoder m_InBitStream; - -- void CCoder::ReleaseStreams() -+ void ReleaseStreams() - { - m_OutWindowStream.ReleaseStream(); - m_InBitStream.ReleaseStream(); -@@ -62,4 +62,4 @@ public: - - }}} - --#endif -\ No newline at end of file -+#endif -diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h ---- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h 2005-09-22 19:53:20.000000000 +0200 -+++ p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h 2006-02-09 17:23:19.000000000 +0100 -@@ -60,7 +60,7 @@ class CCoder: - void DeCodeLevelTable(Byte *newLevels, int numLevels); - bool ReadTables(); - -- void CCoder::ReleaseStreams() -+ void ReleaseStreams() - { - m_OutWindowStream.ReleaseStream(); - ReleaseInStream(); -diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h ---- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h 2005-11-19 22:09:02.000000000 +0100 -+++ p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h 2006-02-09 17:32:27.000000000 +0100 -@@ -115,7 +115,7 @@ class CCoder - void CopyBackBlockOp(UInt32 distance, UInt32 length); - void WriteBlockData(bool writeMode, bool finalBlock); - -- void CCoder::ReleaseStreams() -+ void ReleaseStreams() - { - // m_MatchFinder.ReleaseStream(); - m_OutStream.ReleaseStream(); -diff -Naupr p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h ---- p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h 2005-09-22 19:53:21.000000000 +0200 -+++ p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h 2006-02-09 17:37:56.000000000 +0100 -@@ -53,7 +53,7 @@ class CCoder : - CHuffmanDecoder m_PHuffmanDecoder; - CHuffmanDecoder m_CHuffmanDecoder; - -- void CCoder::ReleaseStreams() -+ void ReleaseStreams() - { - m_OutWindowStream.ReleaseStream(); - m_InBitStream.ReleaseStream(); -diff -Naupr p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h ---- p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h 2005-09-22 19:53:22.000000000 +0200 -+++ p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h 2006-02-09 17:20:16.000000000 +0100 -@@ -52,7 +52,7 @@ public: - - CStdOutStream *OutStream; - -- void CExtractCallbackConsole::Init() -+ void Init() - { - NumArchives = 0; - NumArchiveErrors = 0; diff --git a/sources b/sources index 895820f..68a232c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf30baaf8eeba8ad28d1a1f17db4cc1e p7zip_4.30_src_all.tar.bz2 +06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 From 59f8731e5847add8d1744f2d74c9a2ed839a11da Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 29 Jun 2006 14:30:44 +0000 Subject: [PATCH 11/86] Update to 4.42. --- .cvsignore | 2 +- p7zip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e0e0344..b05483f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.39_src_all-norar.tar.bz2 +p7zip_4.42_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index e4256d5..b0da4b5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,6 +1,6 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.39 +Version: 4.42 Release: 1%{?dist} License: LGPL Group: Applications/Archiving @@ -11,7 +11,7 @@ URL: http://p7zip.sourceforge.net/ # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 # rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt -# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +# tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -94,6 +94,9 @@ EOF %changelog +* Thu Jun 29 2006 Matthias Saou 4.42-1 +- Update to 4.42. + * Tue May 2 2006 Matthias Saou 4.39-1 - Update to 4.39. - Remove no longer needed gcc 4.1 patch. diff --git a/sources b/sources index 68a232c..8ae733b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06dc4693d44c9efecca98969256ddb6c p7zip_4.39_src_all-norar.tar.bz2 +d2e850c3ea7c3631a3195eda843a29de p7zip_4.42_src_all-norar.tar.bz2 From fb46454b6f621cfa10af9f4f63d34d2d905bf8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 20:44:34 +0000 Subject: [PATCH 12/86] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 4904614fd6e5a2c99395545dfae06cb08dbdbbb3 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 28 Aug 2006 11:24:36 +0000 Subject: [PATCH 13/86] FC6 rebuilds. --- needs.rebuild | 1 - p7zip.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/p7zip.spec b/p7zip.spec index b0da4b5..7bd9aea 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.42 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -94,6 +94,9 @@ EOF %changelog +* Mon Aug 28 2006 Matthias Saou 4.42-2 +- FC6 rebuild. + * Thu Jun 29 2006 Matthias Saou 4.42-1 - Update to 4.42. From b2913b7829811811c6040101b4e584d9eba55c48 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 1 Mar 2007 18:02:52 +0000 Subject: [PATCH 14/86] Update to 4.44. --- .cvsignore | 2 +- p7zip.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index b05483f..4f5e99c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.42_src_all-norar.tar.bz2 +p7zip_4.44_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 7bd9aea..bf0c9a8 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.42 -Release: 2%{?dist} +Version: 4.44 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -9,7 +9,7 @@ URL: http://p7zip.sourceforge.net/ #Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 # VERSION= # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 -# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar* +# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar* # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 @@ -23,7 +23,7 @@ compression ratio. The original version can be found at http://www.7-zip.org/. %package plugins Summary: Additional plugins for p7zip Group: Applications/Archiving -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %description plugins Additional plugins that can be used with 7z to extend its abilities. @@ -31,7 +31,7 @@ This package contains also a virtual file system for Midnight Commander. %prep -%setup -n %{name}_%{version} +%setup -q -n %{name}_%{version} # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the # same directory as the binaries, and we don't want them in %{_bindir}. @@ -77,7 +77,7 @@ EOF %files -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %doc ChangeLog README TODO DOCS/* %{_bindir}/7za %dir %{_libexecdir}/p7zip/ @@ -85,7 +85,7 @@ EOF %{_libexecdir}/p7zip/7zCon.sfx %files plugins -%defattr(-, root, root, 0755) +%defattr(-,root,root,-) %doc contrib/ %{_bindir}/7z %{_libexecdir}/p7zip/7z @@ -94,6 +94,9 @@ EOF %changelog +* Thu Mar 1 2007 Matthias Saou 4.44-1 +- Update to 4.44. + * Mon Aug 28 2006 Matthias Saou 4.42-2 - FC6 rebuild. diff --git a/sources b/sources index 8ae733b..e21b53c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2e850c3ea7c3631a3195eda843a29de p7zip_4.42_src_all-norar.tar.bz2 +d25e7afd265f1478d027b82a2f8db81f p7zip_4.44_src_all-norar.tar.bz2 From 657653a7bb9b38955186093135479f18fb4e089b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 1 Mar 2007 18:58:45 +0000 Subject: [PATCH 15/86] Remove _smp_mflags since some builds fail with suspicious errors. --- p7zip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index bf0c9a8..8e8eca5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.44 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -57,7 +57,7 @@ EOF # Use optflags %{__perl} -pi -e 's|^ALLFLAGS=.*|ALLFLAGS=-Wall %{optflags} -fPIC \\|g' \ makefile.machine -%{__make} %{?_smp_mflags} 7z 7za sfx +%{__make} 7z 7za sfx %install @@ -94,6 +94,9 @@ EOF %changelog +* Thu Mar 1 2007 Matthias Saou 4.44-2 +- Remove _smp_mflags since some builds fail with suspicious errors. + * Thu Mar 1 2007 Matthias Saou 4.44-1 - Update to 4.44. @@ -145,7 +148,7 @@ EOF - upgraded to 4.14 * Mon Dec 20 2004 Marcin Zajączkowski - - added 7za script and moved SFX module to {_datadir}/%{name}/ to allow 7za & 7z + - added 7za script and moved SFX module to _datadir/name/ to allow 7za & 7z use it simultaneously - returned to plugins in separate package From 0ee71b98f52470b4ff48132c0c89acd152a80cfb Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Fri, 2 Mar 2007 10:47:55 +0000 Subject: [PATCH 16/86] Remove _smp_mflags since some builds fail with suspicious errors. --- p7zip.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/p7zip.spec b/p7zip.spec index 8e8eca5..c85a4c7 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -57,6 +57,7 @@ EOF # Use optflags %{__perl} -pi -e 's|^ALLFLAGS=.*|ALLFLAGS=-Wall %{optflags} -fPIC \\|g' \ makefile.machine +# Don't use _smp_mflags since the build sometimes fails with it (as of 4.44) %{__make} 7z 7za sfx From 80aa7d7a2ec6f642c9f997aa20c9df0a66312691 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 19 Jun 2007 14:48:47 +0000 Subject: [PATCH 17/86] Update to 4.47 with major build and spec file changes. --- .cvsignore | 2 +- p7zip.spec | 81 +++++++++++++--------- p7zip_4.47-install.patch | 142 +++++++++++++++++++++++++++++++++++++++ p7zip_4.47-norar.patch | 140 ++++++++++++++++++++++++++++++++++++++ p7zip_4.47-nostrip.patch | 24 +++++++ sources | 2 +- 6 files changed, 357 insertions(+), 34 deletions(-) create mode 100644 p7zip_4.47-install.patch create mode 100644 p7zip_4.47-norar.patch create mode 100644 p7zip_4.47-nostrip.patch diff --git a/.cvsignore b/.cvsignore index 4f5e99c..dada22d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.44_src_all-norar.tar.bz2 +p7zip_4.47_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index c85a4c7..519748e 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.44 -Release: 2%{?dist} +Version: 4.47 +Release: 1%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -13,7 +13,13 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 +Patch0: p7zip_4.47-norar.patch +Patch1: p7zip_4.47-install.patch +Patch2: p7zip_4.47-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +%ifarch x86_64 +BuildRequires: yasm +%endif %description p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high @@ -32,45 +38,43 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -q -n %{name}_%{version} - -# Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the -# same directory as the binaries, and we don't want them in %{_bindir}. -%{__cat} << 'EOF' > 7za.sh -#!/bin/sh -exec %{_libexecdir}/p7zip/7za "$@" -EOF - -%{__cat} << 'EOF' > 7z.sh -#!/bin/sh -exec %{_libexecdir}/p7zip/7z "$@" -EOF +%patch0 -p1 -b .norar +%patch1 -p1 -b .install +%patch2 -p1 -b .nostrip +# Move docs early so that they don't get installed by "make install" and we +# can include them in %%doc +%{__mv} DOCS docs +%{__mv} ChangeLog README TODO docs/ +# And fix useless executable bit while we're at it +find docs -type f -exec chmod -x {} \; +find contrib -type f -exec chmod -x {} \; %build -%ifarch %{ix86} ppc -%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine +%ifarch %{ix86} ppc ppc64 +%{__cp} -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine %endif %ifarch x86_64 -%{__cp} -f makefile.linux_amd64 makefile.machine +%{__cp} -f makefile.linux_amd64_asm makefile.machine %endif -# Use optflags -%{__perl} -pi -e 's|^ALLFLAGS=.*|ALLFLAGS=-Wall %{optflags} -fPIC \\|g' \ - makefile.machine # Don't use _smp_mflags since the build sometimes fails with it (as of 4.44) -%{__make} 7z 7za sfx +%{__make} %{?_smp_mflags} all2 \ + OPTFLAGS="%{optflags}" \ + DEST_HOME=%{_prefix} \ + DEST_BIN=%{_bindir} \ + DEST_SHARE=%{_libexecdir}/p7zip \ + DEST_MAN=%{_mandir} %install %{__rm} -rf %{buildroot} - -# Install binaries (7za, 7z, 7zCon.sfx and Codecs/Formats) -%{__mkdir_p} %{buildroot}%{_libexecdir}/p7zip/ -%{__cp} -a bin/* %{buildroot}%{_libexecdir}/p7zip/ - -# Install wrapper scripts -%{__install} -D -m 0755 7z.sh %{buildroot}%{_bindir}/7z -%{__install} -D -m 0755 7za.sh %{buildroot}%{_bindir}/7za +%{__make} install \ + DEST_DIR=%{buildroot} \ + DEST_HOME=%{_prefix} \ + DEST_BIN=%{_bindir} \ + DEST_SHARE=%{_libexecdir}/p7zip \ + DEST_MAN=%{_mandir} %clean @@ -79,22 +83,35 @@ EOF %files %defattr(-,root,root,-) -%doc ChangeLog README TODO DOCS/* +%doc docs/* %{_bindir}/7za %dir %{_libexecdir}/p7zip/ %{_libexecdir}/p7zip/7za %{_libexecdir}/p7zip/7zCon.sfx +%{_mandir}/man1/7za.1* +%exclude %{_mandir}/man1/7zr.1* %files plugins %defattr(-,root,root,-) %doc contrib/ %{_bindir}/7z %{_libexecdir}/p7zip/7z -%{_libexecdir}/p7zip/Codecs/ -%{_libexecdir}/p7zip/Formats/ +%{_libexecdir}/p7zip/7z.so +#{_libexecdir}/p7zip/Codecs/ +#{_libexecdir}/p7zip/Formats/ +%{_mandir}/man1/7z.1* %changelog +* Tue Jun 19 2007 Matthias Saou 4.47-1 +- Update to 4.47. +- Include now required patch to exclude removed Rar bits from makefiles. +- Switch to using "make install" for installation... so patch and hack. +- Use the asm makefile for x86_64, so build require yasm for it too. +- Add ppc64 to the main %%ifarch. +- Remove no longer included Codecs and Formats dirs (7z.so replaces them?). +- Remove our wrapper scripts, since the install script creates its own. + * Thu Mar 1 2007 Matthias Saou 4.44-2 - Remove _smp_mflags since some builds fail with suspicious errors. diff --git a/p7zip_4.47-install.patch b/p7zip_4.47-install.patch new file mode 100644 index 0000000..52f0461 --- /dev/null +++ b/p7zip_4.47-install.patch @@ -0,0 +1,142 @@ +diff -Naupr p7zip_4.47.orig/install.sh p7zip_4.47/install.sh +--- p7zip_4.47.orig/install.sh 2007-05-26 12:22:11.000000000 +0200 ++++ p7zip_4.47/install.sh 2007-06-19 16:02:55.000000000 +0200 +@@ -56,49 +56,41 @@ then + then + echo "- installing ${DEST_DIR}${DEST_BIN}/7za" + cp bin/7za ${DEST_DIR}${DEST_SHARE}/7za +- chmod 777 ${DEST_DIR}${DEST_SHARE}/7za +- strip ${DEST_DIR}${DEST_SHARE}/7za +- chmod 555 ${DEST_DIR}${DEST_SHARE}/7za ++ chmod 755 ${DEST_DIR}${DEST_SHARE}/7za + echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7za + echo "${DEST_SHARE}/7za \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7za +- chmod 555 ${DEST_DIR}${DEST_BIN}/7za ++ chmod 755 ${DEST_DIR}${DEST_BIN}/7za + fi + + if [ -x bin/7zr ] + then + echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" + cp bin/7zr ${DEST_DIR}${DEST_SHARE}/7zr +- chmod 777 ${DEST_DIR}${DEST_SHARE}/7zr +- strip ${DEST_DIR}${DEST_SHARE}/7zr +- chmod 555 ${DEST_DIR}${DEST_SHARE}/7zr ++ chmod 755 ${DEST_DIR}${DEST_SHARE}/7zr + echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7zr + echo "${DEST_SHARE}/7zr \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7zr +- chmod 555 ${DEST_DIR}${DEST_BIN}/7zr ++ chmod 755 ${DEST_DIR}${DEST_BIN}/7zr + fi + + if [ -x bin/7zCon.sfx ] + then + echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx" + cp bin/7zCon.sfx ${DEST_DIR}${DEST_SHARE}/7zCon.sfx +- chmod 777 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx +- strip ${DEST_DIR}${DEST_SHARE}/7zCon.sfx +- chmod 555 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx ++ chmod 755 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx + fi + + if [ -x bin/7z ] + then + echo "- installing ${DEST_DIR}${DEST_BIN}/7z" + cp bin/7z ${DEST_DIR}${DEST_SHARE}/7z +- chmod 777 ${DEST_DIR}${DEST_SHARE}/7z +- strip ${DEST_DIR}${DEST_SHARE}/7z +- chmod 555 ${DEST_DIR}${DEST_SHARE}/7z ++ chmod 755 ${DEST_DIR}${DEST_SHARE}/7z + cp -r bin/Codecs ${DEST_DIR}${DEST_SHARE}/ +- chmod 555 ${DEST_DIR}${DEST_SHARE}/*/* ++ chmod 755 ${DEST_DIR}${DEST_SHARE}/*/* + cp bin/7z.so ${DEST_DIR}${DEST_SHARE}/7z.so +- chmod 555 ${DEST_DIR}${DEST_SHARE}/7z.so ++ chmod 755 ${DEST_DIR}${DEST_SHARE}/7z.so + echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7z + echo "${DEST_SHARE}/7z \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7z +- chmod 555 ${DEST_DIR}${DEST_BIN}/7z ++ chmod 755 ${DEST_DIR}${DEST_BIN}/7z + fi + + else +@@ -107,7 +99,7 @@ else + echo "- installing ${DEST_DIR}${DEST_BIN}/7za" + mkdir -p ${DEST_DIR}${DEST_BIN} + cp bin/7za ${DEST_DIR}${DEST_BIN}/7za +- chmod 555 ${DEST_DIR}${DEST_BIN}/7za ++ chmod 755 ${DEST_DIR}${DEST_BIN}/7za + fi + + if [ -x bin/7zr ] +@@ -115,7 +107,7 @@ else + echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" + mkdir -p ${DEST_DIR}${DEST_BIN} + cp bin/7zr ${DEST_DIR}${DEST_BIN}/7zr +- chmod 555 ${DEST_DIR}${DEST_BIN}/7zr ++ chmod 755 ${DEST_DIR}${DEST_BIN}/7zr + fi + fi + +@@ -124,27 +116,27 @@ if [ -d DOCS ] + then + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1 +- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1 ++ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7z.1 + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1 +- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1 ++ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7za.1 + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1 +- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 ++ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 + else + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" + grep -v "{DEST_SHARE_DOC}" man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1 +- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1 ++ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7z.1 + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" + grep -v "{DEST_SHARE_DOC}" man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1 +- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1 ++ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7za.1 + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" + grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1 +- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 ++ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 + fi + + if [ -f README ] +@@ -152,7 +144,7 @@ then + echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" + mkdir -p ${DEST_DIR}${DEST_SHARE_DOC} + cp README ${DEST_DIR}${DEST_SHARE_DOC}/README +- chmod 444 ${DEST_DIR}${DEST_SHARE_DOC}/README ++ chmod 644 ${DEST_DIR}${DEST_SHARE_DOC}/README + fi + + if [ -f ChangeLog ] +@@ -160,7 +152,7 @@ then + echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" + mkdir -p ${DEST_DIR}${DEST_SHARE_DOC} + cp ChangeLog ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog +- chmod 444 ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog ++ chmod 644 ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog + fi + + if [ -d DOCS ] +@@ -168,7 +160,7 @@ then + echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" + mkdir -p ${DEST_DIR}${DEST_SHARE_DOC} + cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS +- find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \; +- find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \; ++ find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 755 {} \; ++ find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 644 {} \; + fi + diff --git a/p7zip_4.47-norar.patch b/p7zip_4.47-norar.patch new file mode 100644 index 0000000..0673fbc --- /dev/null +++ b/p7zip_4.47-norar.patch @@ -0,0 +1,140 @@ +diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile 2007-05-27 11:57:49.000000000 +0200 ++++ p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile 2007-06-19 15:17:32.000000000 +0200 +@@ -87,9 +87,6 @@ Pbkdf2HmacSha1.o \ + RandGen.o \ + Sha1.o \ + Sha256.o \ +-RarAES.o \ +-Rar20Cipher.o \ +-Rar20Crypto.o \ + WzAES.o \ + ZipCipher.o \ + ZipCrypto.o \ +@@ -126,12 +123,6 @@ StreamUtils.o \ + 7zRegister.o \ + 7zSpecStream.o \ + 7zUpdate.o \ +-RarHandler.o \ +-RarHeader.o \ +-RarIn.o \ +-RarItem.o \ +-RarRegister.o \ +-RarVolumeInStream.o \ + ArjHandler.o \ + ArjIn.o \ + ArjRegister.o \ +diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-05-27 11:57:49.000000000 +0200 ++++ p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-06-19 15:18:15.000000000 +0200 +@@ -37,11 +37,6 @@ SRCS=\ + ../../Compress/BZip2/BZip2Decoder.cpp \ + ../../Compress/BZip2/BZip2Encoder.cpp \ + ../../Compress/BZip2/BZip2Register.cpp \ +- ../../Compress/Rar/Rar1Decoder.cpp \ +- ../../Compress/Rar/Rar2Decoder.cpp \ +- ../../Compress/Rar/Rar3Decoder.cpp \ +- ../../Compress/Rar/Rar3Vm.cpp \ +- ../../Compress/Rar/RarCodecsRegister.cpp \ + ../../Compress/BWT/BlockSort.cpp \ + ../../Compress/Implode/ImplodeDecoder.cpp \ + ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \ +@@ -63,9 +58,6 @@ SRCS=\ + ../../Crypto/Hash/RandGen.cpp \ + ../../Crypto/Hash/Sha1.cpp \ + ../../Crypto/Hash/Sha256.cpp \ +- ../../Crypto/RarAES/RarAES.cpp \ +- ../../Crypto/Rar20/Rar20Cipher.cpp \ +- ../../Crypto/Rar20/Rar20Crypto.cpp \ + ../../Crypto/WzAES/WzAES.cpp \ + ../../Crypto/Zip/ZipCipher.cpp \ + ../../Crypto/Zip/ZipCrypto.cpp \ +@@ -102,12 +94,6 @@ SRCS=\ + ../../Archive/7z/7zRegister.cpp \ + ../../Archive/7z/7zSpecStream.cpp \ + ../../Archive/7z/7zUpdate.cpp \ +- ../../Archive/Rar/RarHandler.cpp \ +- ../../Archive/Rar/RarHeader.cpp \ +- ../../Archive/Rar/RarIn.cpp \ +- ../../Archive/Rar/RarItem.cpp \ +- ../../Archive/Rar/RarRegister.cpp \ +- ../../Archive/Rar/RarVolumeInStream.cpp \ + ../../Archive/Arj/ArjHandler.cpp \ + ../../Archive/Arj/ArjIn.cpp \ + ../../Archive/Arj/ArjRegister.cpp \ +@@ -280,16 +266,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ + $(CXX) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp + BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp + $(CXX) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp +-Rar1Decoder.o : ../../Compress/Rar/Rar1Decoder.cpp +- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar1Decoder.cpp +-Rar2Decoder.o : ../../Compress/Rar/Rar2Decoder.cpp +- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar2Decoder.cpp +-Rar3Decoder.o : ../../Compress/Rar/Rar3Decoder.cpp +- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar3Decoder.cpp +-Rar3Vm.o : ../../Compress/Rar/Rar3Vm.cpp +- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp +-RarCodecsRegister.o : ../../Compress/Rar/RarCodecsRegister.cpp +- $(CXX) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp + BlockSort.o : ../../Compress/BWT/BlockSort.cpp + $(CXX) $(CFLAGS) ../../Compress/BWT/BlockSort.cpp + ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp +@@ -332,12 +308,6 @@ Sha1.o : ../../Crypto/Hash/Sha1.cpp + $(CXX) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp + Sha256.o : ../../Crypto/Hash/Sha256.cpp + $(CXX) $(CFLAGS) ../../Crypto/Hash/Sha256.cpp +-RarAES.o : ../../Crypto/RarAES/RarAES.cpp +- $(CXX) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp +-Rar20Cipher.o : ../../Crypto/Rar20/Rar20Cipher.cpp +- $(CXX) $(CFLAGS) ../../Crypto/Rar20/Rar20Cipher.cpp +-Rar20Crypto.o : ../../Crypto/Rar20/Rar20Crypto.cpp +- $(CXX) $(CFLAGS) ../../Crypto/Rar20/Rar20Crypto.cpp + WzAES.o : ../../Crypto/WzAES/WzAES.cpp + $(CXX) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp + ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp +@@ -410,18 +380,6 @@ StreamUtils.o : ../../Common/StreamUtils + $(CXX) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp + 7zUpdate.o : ../../Archive/7z/7zUpdate.cpp + $(CXX) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp +-RarHandler.o : ../../Archive/Rar/RarHandler.cpp +- $(CXX) $(CFLAGS) ../../Archive/Rar/RarHandler.cpp +-RarHeader.o : ../../Archive/Rar/RarHeader.cpp +- $(CXX) $(CFLAGS) ../../Archive/Rar/RarHeader.cpp +-RarIn.o : ../../Archive/Rar/RarIn.cpp +- $(CXX) $(CFLAGS) ../../Archive/Rar/RarIn.cpp +-RarItem.o : ../../Archive/Rar/RarItem.cpp +- $(CXX) $(CFLAGS) ../../Archive/Rar/RarItem.cpp +-RarRegister.o : ../../Archive/Rar/RarRegister.cpp +- $(CXX) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp +-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp +- $(CXX) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp + ArjHandler.o : ../../Archive/Arj/ArjHandler.cpp + $(CXX) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp + ArjIn.o : ../../Archive/Arj/ArjIn.cpp +diff -Naupr p7zip_4.47.orig/makefile p7zip_4.47/makefile +--- p7zip_4.47.orig/makefile 2007-05-27 11:57:50.000000000 +0200 ++++ p7zip_4.47/makefile 2007-06-19 15:28:26.000000000 +0200 +@@ -41,7 +41,6 @@ depend: + cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend + cd CPP/7zip/Bundles/Format7z ; $(MAKE) depend +- cd CPP/7zip/Compress/Rar ; $(MAKE) depend + + sfx: common + mkdir -p bin +@@ -51,7 +50,6 @@ sfx: common + mkdir -p bin/Codecs + cd CPP/7zip/UI/Console ; $(MAKE) all + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all +- cd CPP/7zip/Compress/Rar ; $(MAKE) all + + clean: + cd CPP/Common ; $(MAKE) clean +@@ -64,7 +62,6 @@ clean: + cd CPP/7zip/Bundles/Format7zF ; $(MAKE) clean + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean + cd CPP/7zip/Bundles/Format7z ; $(MAKE) clean +- cd CPP/7zip/Compress/Rar ; $(MAKE) clean + cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean + cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean + rm -fr bin diff --git a/p7zip_4.47-nostrip.patch b/p7zip_4.47-nostrip.patch new file mode 100644 index 0000000..d459a1b --- /dev/null +++ b/p7zip_4.47-nostrip.patch @@ -0,0 +1,24 @@ +diff -Naupr p7zip_4.47.orig/makefile.linux_amd64_asm p7zip_4.47/makefile.linux_amd64_asm +--- p7zip_4.47.orig/makefile.linux_amd64_asm 2007-05-27 11:57:50.000000000 +0200 ++++ p7zip_4.47/makefile.linux_amd64_asm 2007-06-19 16:43:04.000000000 +0200 +@@ -2,7 +2,7 @@ + OPTFLAGS=-O + + # use "-m32" to have a 32bits executable +-ALLFLAGS=-m64 ${OPTFLAGS} -s -fPIC \ ++ALLFLAGS=-m64 ${OPTFLAGS} -fPIC \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + $(LOCAL_FLAGS) +diff -Naupr p7zip_4.47.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.47/makefile.linux_x86_ppc_alpha_gcc_4.X +--- p7zip_4.47.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-05-27 11:57:49.000000000 +0200 ++++ p7zip_4.47/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-19 16:41:01.000000000 +0200 +@@ -5,7 +5,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -s -fPIC \ ++ALLFLAGS=${OPTFLAGS} -fPIC \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + $(LOCAL_FLAGS) diff --git a/sources b/sources index e21b53c..1d328a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d25e7afd265f1478d027b82a2f8db81f p7zip_4.44_src_all-norar.tar.bz2 +7bf0fb7a5089b733eb52b707b9d274a7 p7zip_4.47_src_all-norar.tar.bz2 From 64f34816626551104868e73c9e86263a121ba524 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 5 Aug 2007 15:57:01 +0000 Subject: [PATCH 18/86] Update to 4.51. --- .cvsignore | 2 +- p7zip.spec | 13 ++- p7zip_4.47-nostrip.patch | 24 ----- ...4.47-norar.patch => p7zip_4.51-norar.patch | 92 +++++++++---------- p7zip_4.51-nostrip.patch | 24 +++++ sources | 2 +- 6 files changed, 81 insertions(+), 76 deletions(-) delete mode 100644 p7zip_4.47-nostrip.patch rename p7zip_4.47-norar.patch => p7zip_4.51-norar.patch (53%) create mode 100644 p7zip_4.51-nostrip.patch diff --git a/.cvsignore b/.cvsignore index dada22d..06ce2e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.47_src_all-norar.tar.bz2 +p7zip_4.51_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 519748e..0fe5312 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,8 +1,9 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.47 +Version: 4.51 Release: 1%{?dist} -License: LGPL +# Files under C/Compress/Lzma/ are dual LGPL or CPL +License: LGPLv2 and (LGPL+ or CPL) Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ # RAR sources removed since their license is incompatible with the LGPL @@ -13,9 +14,9 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_4.47-norar.patch +Patch0: p7zip_4.51-norar.patch Patch1: p7zip_4.47-install.patch -Patch2: p7zip_4.47-nostrip.patch +Patch2: p7zip_4.51-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch x86_64 BuildRequires: yasm @@ -103,6 +104,10 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Sun Aug 5 2007 Matthias Saou 4.51-1 +- Update to 4.51. +- Update License field. + * Tue Jun 19 2007 Matthias Saou 4.47-1 - Update to 4.47. - Include now required patch to exclude removed Rar bits from makefiles. diff --git a/p7zip_4.47-nostrip.patch b/p7zip_4.47-nostrip.patch deleted file mode 100644 index d459a1b..0000000 --- a/p7zip_4.47-nostrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr p7zip_4.47.orig/makefile.linux_amd64_asm p7zip_4.47/makefile.linux_amd64_asm ---- p7zip_4.47.orig/makefile.linux_amd64_asm 2007-05-27 11:57:50.000000000 +0200 -+++ p7zip_4.47/makefile.linux_amd64_asm 2007-06-19 16:43:04.000000000 +0200 -@@ -2,7 +2,7 @@ - OPTFLAGS=-O - - # use "-m32" to have a 32bits executable --ALLFLAGS=-m64 ${OPTFLAGS} -s -fPIC \ -+ALLFLAGS=-m64 ${OPTFLAGS} -fPIC \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) -diff -Naupr p7zip_4.47.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.47/makefile.linux_x86_ppc_alpha_gcc_4.X ---- p7zip_4.47.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-05-27 11:57:49.000000000 +0200 -+++ p7zip_4.47/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-19 16:41:01.000000000 +0200 -@@ -5,7 +5,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -s -fPIC \ -+ALLFLAGS=${OPTFLAGS} -fPIC \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) diff --git a/p7zip_4.47-norar.patch b/p7zip_4.51-norar.patch similarity index 53% rename from p7zip_4.47-norar.patch rename to p7zip_4.51-norar.patch index 0673fbc..798ed92 100644 --- a/p7zip_4.47-norar.patch +++ b/p7zip_4.51-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile 2007-05-27 11:57:49.000000000 +0200 -+++ p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile 2007-06-19 15:17:32.000000000 +0200 -@@ -87,9 +87,6 @@ Pbkdf2HmacSha1.o \ +diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile 2007-07-24 21:02:45.000000000 +0200 ++++ p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile 2007-08-05 17:49:13.000000000 +0200 +@@ -85,9 +85,6 @@ Pbkdf2HmacSha1.o \ RandGen.o \ Sha1.o \ Sha256.o \ @@ -24,10 +24,10 @@ diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.47/CP ArjHandler.o \ ArjIn.o \ ArjRegister.o \ -diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-05-27 11:57:49.000000000 +0200 -+++ p7zip_4.47/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-06-19 15:18:15.000000000 +0200 -@@ -37,11 +37,6 @@ SRCS=\ +diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-07-24 21:08:44.000000000 +0200 ++++ p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-08-05 17:49:47.000000000 +0200 +@@ -48,11 +48,6 @@ SRCS=\ ../../Compress/BZip2/BZip2Decoder.cpp \ ../../Compress/BZip2/BZip2Encoder.cpp \ ../../Compress/BZip2/BZip2Register.cpp \ @@ -39,7 +39,7 @@ diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Compress/BWT/BlockSort.cpp \ ../../Compress/Implode/ImplodeDecoder.cpp \ ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \ -@@ -63,9 +58,6 @@ SRCS=\ +@@ -74,9 +69,6 @@ SRCS=\ ../../Crypto/Hash/RandGen.cpp \ ../../Crypto/Hash/Sha1.cpp \ ../../Crypto/Hash/Sha256.cpp \ @@ -49,7 +49,7 @@ diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Crypto/WzAES/WzAES.cpp \ ../../Crypto/Zip/ZipCipher.cpp \ ../../Crypto/Zip/ZipCrypto.cpp \ -@@ -102,12 +94,6 @@ SRCS=\ +@@ -115,12 +107,6 @@ SRCS=\ ../../Archive/7z/7zRegister.cpp \ ../../Archive/7z/7zSpecStream.cpp \ ../../Archive/7z/7zUpdate.cpp \ @@ -62,78 +62,78 @@ diff -Naupr p7zip_4.47.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Archive/Arj/ArjHandler.cpp \ ../../Archive/Arj/ArjIn.cpp \ ../../Archive/Arj/ArjRegister.cpp \ -@@ -280,16 +266,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ - $(CXX) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp +@@ -330,16 +316,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp - $(CXX) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp -Rar1Decoder.o : ../../Compress/Rar/Rar1Decoder.cpp -- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar1Decoder.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar1Decoder.cpp -Rar2Decoder.o : ../../Compress/Rar/Rar2Decoder.cpp -- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar2Decoder.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar2Decoder.cpp -Rar3Decoder.o : ../../Compress/Rar/Rar3Decoder.cpp -- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar3Decoder.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Decoder.cpp -Rar3Vm.o : ../../Compress/Rar/Rar3Vm.cpp -- $(CXX) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp -RarCodecsRegister.o : ../../Compress/Rar/RarCodecsRegister.cpp -- $(CXX) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp BlockSort.o : ../../Compress/BWT/BlockSort.cpp - $(CXX) $(CFLAGS) ../../Compress/BWT/BlockSort.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BWT/BlockSort.cpp ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp -@@ -332,12 +308,6 @@ Sha1.o : ../../Crypto/Hash/Sha1.cpp - $(CXX) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp +@@ -382,12 +358,6 @@ Sha1.o : ../../Crypto/Hash/Sha1.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp Sha256.o : ../../Crypto/Hash/Sha256.cpp - $(CXX) $(CFLAGS) ../../Crypto/Hash/Sha256.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha256.cpp -RarAES.o : ../../Crypto/RarAES/RarAES.cpp -- $(CXX) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp -Rar20Cipher.o : ../../Crypto/Rar20/Rar20Cipher.cpp -- $(CXX) $(CFLAGS) ../../Crypto/Rar20/Rar20Cipher.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Rar20/Rar20Cipher.cpp -Rar20Crypto.o : ../../Crypto/Rar20/Rar20Crypto.cpp -- $(CXX) $(CFLAGS) ../../Crypto/Rar20/Rar20Crypto.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Rar20/Rar20Crypto.cpp WzAES.o : ../../Crypto/WzAES/WzAES.cpp - $(CXX) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp -@@ -410,18 +380,6 @@ StreamUtils.o : ../../Common/StreamUtils - $(CXX) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp +@@ -464,18 +434,6 @@ StreamUtils.o : ../../Common/StreamUtils + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp 7zUpdate.o : ../../Archive/7z/7zUpdate.cpp - $(CXX) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp -RarHandler.o : ../../Archive/Rar/RarHandler.cpp -- $(CXX) $(CFLAGS) ../../Archive/Rar/RarHandler.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarHandler.cpp -RarHeader.o : ../../Archive/Rar/RarHeader.cpp -- $(CXX) $(CFLAGS) ../../Archive/Rar/RarHeader.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarHeader.cpp -RarIn.o : ../../Archive/Rar/RarIn.cpp -- $(CXX) $(CFLAGS) ../../Archive/Rar/RarIn.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarIn.cpp -RarItem.o : ../../Archive/Rar/RarItem.cpp -- $(CXX) $(CFLAGS) ../../Archive/Rar/RarItem.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarItem.cpp -RarRegister.o : ../../Archive/Rar/RarRegister.cpp -- $(CXX) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp -RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp -- $(CXX) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp +- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp ArjHandler.o : ../../Archive/Arj/ArjHandler.cpp - $(CXX) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp ArjIn.o : ../../Archive/Arj/ArjIn.cpp -diff -Naupr p7zip_4.47.orig/makefile p7zip_4.47/makefile ---- p7zip_4.47.orig/makefile 2007-05-27 11:57:50.000000000 +0200 -+++ p7zip_4.47/makefile 2007-06-19 15:28:26.000000000 +0200 -@@ -41,7 +41,6 @@ depend: +diff -Naupr p7zip_4.51.orig/makefile p7zip_4.51/makefile +--- p7zip_4.51.orig/makefile 2007-06-30 09:25:51.000000000 +0200 ++++ p7zip_4.51/makefile 2007-08-05 17:50:16.000000000 +0200 +@@ -38,7 +38,6 @@ depend: + cd CPP/7zip/UI/Client7z ; $(MAKE) depend cd CPP/7zip/UI/Console ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7z ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend sfx: common mkdir -p bin -@@ -51,7 +50,6 @@ sfx: common +@@ -48,7 +47,6 @@ sfx: common mkdir -p bin/Codecs cd CPP/7zip/UI/Console ; $(MAKE) all cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all - cd CPP/7zip/Compress/Rar ; $(MAKE) all clean: - cd CPP/Common ; $(MAKE) clean -@@ -64,7 +62,6 @@ clean: - cd CPP/7zip/Bundles/Format7zF ; $(MAKE) clean + cd CPP/myWindows ; $(MAKE) clean +@@ -58,7 +56,6 @@ clean: + cd CPP/7zip/UI/Client7z ; $(MAKE) clean + cd CPP/7zip/UI/Console ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Bundles/Format7z ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean diff --git a/p7zip_4.51-nostrip.patch b/p7zip_4.51-nostrip.patch new file mode 100644 index 0000000..c7379d0 --- /dev/null +++ b/p7zip_4.51-nostrip.patch @@ -0,0 +1,24 @@ +diff -Naupr p7zip_4.51.orig/makefile.linux_amd64_asm p7zip_4.51/makefile.linux_amd64_asm +--- p7zip_4.51.orig/makefile.linux_amd64_asm 2007-06-28 09:32:30.000000000 +0200 ++++ p7zip_4.51/makefile.linux_amd64_asm 2007-08-05 17:52:20.000000000 +0200 +@@ -2,7 +2,7 @@ + OPTFLAGS=-O + + # use "-m32" to have a 32bits executable +-ALLFLAGS=-m64 ${OPTFLAGS} -s \ ++ALLFLAGS=-m64 ${OPTFLAGS} \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + $(LOCAL_FLAGS) +diff -Naupr p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X +--- p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-28 09:33:43.000000000 +0200 ++++ p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-08-05 17:52:45.000000000 +0200 +@@ -5,7 +5,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -s \ ++ALLFLAGS=${OPTFLAGS} \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + $(LOCAL_FLAGS) diff --git a/sources b/sources index 1d328a0..b507337 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bf0fb7a5089b733eb52b707b9d274a7 p7zip_4.47_src_all-norar.tar.bz2 +f56f89b77f77f2e7661109a88ecddce3 p7zip_4.51_src_all-norar.tar.bz2 From cf51bf4f7754abaf7e7782bb1f5123bd28530ba1 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 9 Aug 2007 08:21:17 +0000 Subject: [PATCH 19/86] Update License field some more (LGPL+ to LGPLv2+). --- p7zip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 0fe5312..2ba2ca3 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,9 +1,9 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.51 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL -License: LGPLv2 and (LGPL+ or CPL) +License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ # RAR sources removed since their license is incompatible with the LGPL @@ -104,6 +104,9 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Thu Aug 9 2007 Matthias Saou 4.51-2 +- Update License field some more (LGPL+ to LGPLv2+). + * Sun Aug 5 2007 Matthias Saou 4.51-1 - Update to 4.51. - Update License field. From f59cd2bde27be72612cd9a9ad46f34b87e662941 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 22 Aug 2007 18:25:42 +0000 Subject: [PATCH 20/86] Rebuild for new BuildID feature. --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 2ba2ca3..dba2d65 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.51 -Release: 2%{?dist} +Release: 3%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -104,6 +104,9 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Wed Aug 22 2007 Matthias Saou 4.51-3 +- Rebuild for new BuildID feature. + * Thu Aug 9 2007 Matthias Saou 4.51-2 - Update License field some more (LGPL+ to LGPLv2+). From d9e9faeef3e4f468add24b74c72c60e570f007c6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 20 Feb 2008 04:29:47 +0000 Subject: [PATCH 21/86] - Autorebuild for GCC 4.3 --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index dba2d65..1142fd3 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.51 -Release: 3%{?dist} +Release: 4%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -104,6 +104,9 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 4.51-4 +- Autorebuild for GCC 4.3 + * Wed Aug 22 2007 Matthias Saou 4.51-3 - Rebuild for new BuildID feature. From 1cd5199dbf5be3e10ae657c1698b280d2035444b Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Wed, 18 Jun 2008 12:17:47 +0000 Subject: [PATCH 22/86] Update to 4.58. --- .cvsignore | 2 +- p7zip.spec | 15 +- p7zip_4.47-install.patch | 142 ------------------ p7zip_4.58-install.patch | 142 ++++++++++++++++++ ...4.51-norar.patch => p7zip_4.58-norar.patch | 60 ++++---- sources | 2 +- 6 files changed, 184 insertions(+), 179 deletions(-) delete mode 100644 p7zip_4.47-install.patch create mode 100644 p7zip_4.58-install.patch rename p7zip_4.51-norar.patch => p7zip_4.58-norar.patch (73%) diff --git a/.cvsignore b/.cvsignore index 06ce2e3..2ede8b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.51_src_all-norar.tar.bz2 +p7zip_4.58_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 1142fd3..1c40777 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.51 -Release: 4%{?dist} +Version: 4.58 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -14,8 +14,8 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_4.51-norar.patch -Patch1: p7zip_4.47-install.patch +Patch0: p7zip_4.58-norar.patch +Patch1: p7zip_4.58-install.patch Patch2: p7zip_4.51-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch x86_64 @@ -104,7 +104,12 @@ find contrib -type f -exec chmod -x {} \; %changelog -* Tue Feb 19 2008 Fedora Release Engineering - 4.51-4 +* Wed Jun 18 2008 Matthias Saou 4.58-1 +- Update to 4.58. +- Update norar patch. +- Update install patch. + +* Tue Feb 19 2008 Fedora Release Engineering - Autorebuild for GCC 4.3 * Wed Aug 22 2007 Matthias Saou 4.51-3 diff --git a/p7zip_4.47-install.patch b/p7zip_4.47-install.patch deleted file mode 100644 index 52f0461..0000000 --- a/p7zip_4.47-install.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -Naupr p7zip_4.47.orig/install.sh p7zip_4.47/install.sh ---- p7zip_4.47.orig/install.sh 2007-05-26 12:22:11.000000000 +0200 -+++ p7zip_4.47/install.sh 2007-06-19 16:02:55.000000000 +0200 -@@ -56,49 +56,41 @@ then - then - echo "- installing ${DEST_DIR}${DEST_BIN}/7za" - cp bin/7za ${DEST_DIR}${DEST_SHARE}/7za -- chmod 777 ${DEST_DIR}${DEST_SHARE}/7za -- strip ${DEST_DIR}${DEST_SHARE}/7za -- chmod 555 ${DEST_DIR}${DEST_SHARE}/7za -+ chmod 755 ${DEST_DIR}${DEST_SHARE}/7za - echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7za - echo "${DEST_SHARE}/7za \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7za -- chmod 555 ${DEST_DIR}${DEST_BIN}/7za -+ chmod 755 ${DEST_DIR}${DEST_BIN}/7za - fi - - if [ -x bin/7zr ] - then - echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" - cp bin/7zr ${DEST_DIR}${DEST_SHARE}/7zr -- chmod 777 ${DEST_DIR}${DEST_SHARE}/7zr -- strip ${DEST_DIR}${DEST_SHARE}/7zr -- chmod 555 ${DEST_DIR}${DEST_SHARE}/7zr -+ chmod 755 ${DEST_DIR}${DEST_SHARE}/7zr - echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7zr - echo "${DEST_SHARE}/7zr \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7zr -- chmod 555 ${DEST_DIR}${DEST_BIN}/7zr -+ chmod 755 ${DEST_DIR}${DEST_BIN}/7zr - fi - - if [ -x bin/7zCon.sfx ] - then - echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - cp bin/7zCon.sfx ${DEST_DIR}${DEST_SHARE}/7zCon.sfx -- chmod 777 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx -- strip ${DEST_DIR}${DEST_SHARE}/7zCon.sfx -- chmod 555 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx -+ chmod 755 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx - fi - - if [ -x bin/7z ] - then - echo "- installing ${DEST_DIR}${DEST_BIN}/7z" - cp bin/7z ${DEST_DIR}${DEST_SHARE}/7z -- chmod 777 ${DEST_DIR}${DEST_SHARE}/7z -- strip ${DEST_DIR}${DEST_SHARE}/7z -- chmod 555 ${DEST_DIR}${DEST_SHARE}/7z -+ chmod 755 ${DEST_DIR}${DEST_SHARE}/7z - cp -r bin/Codecs ${DEST_DIR}${DEST_SHARE}/ -- chmod 555 ${DEST_DIR}${DEST_SHARE}/*/* -+ chmod 755 ${DEST_DIR}${DEST_SHARE}/*/* - cp bin/7z.so ${DEST_DIR}${DEST_SHARE}/7z.so -- chmod 555 ${DEST_DIR}${DEST_SHARE}/7z.so -+ chmod 755 ${DEST_DIR}${DEST_SHARE}/7z.so - echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7z - echo "${DEST_SHARE}/7z \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7z -- chmod 555 ${DEST_DIR}${DEST_BIN}/7z -+ chmod 755 ${DEST_DIR}${DEST_BIN}/7z - fi - - else -@@ -107,7 +99,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7za" - mkdir -p ${DEST_DIR}${DEST_BIN} - cp bin/7za ${DEST_DIR}${DEST_BIN}/7za -- chmod 555 ${DEST_DIR}${DEST_BIN}/7za -+ chmod 755 ${DEST_DIR}${DEST_BIN}/7za - fi - - if [ -x bin/7zr ] -@@ -115,7 +107,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" - mkdir -p ${DEST_DIR}${DEST_BIN} - cp bin/7zr ${DEST_DIR}${DEST_BIN}/7zr -- chmod 555 ${DEST_DIR}${DEST_BIN}/7zr -+ chmod 755 ${DEST_DIR}${DEST_BIN}/7zr - fi - fi - -@@ -124,27 +116,27 @@ if [ -d DOCS ] - then - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1 -- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1 -+ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7z.1 - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1 -- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1 -+ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7za.1 - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1 -- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 -+ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 - else - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - grep -v "{DEST_SHARE_DOC}" man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1 -- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1 -+ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7z.1 - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - grep -v "{DEST_SHARE_DOC}" man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1 -- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1 -+ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7za.1 - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1 -- chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 -+ chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7zr.1 - fi - - if [ -f README ] -@@ -152,7 +144,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" - mkdir -p ${DEST_DIR}${DEST_SHARE_DOC} - cp README ${DEST_DIR}${DEST_SHARE_DOC}/README -- chmod 444 ${DEST_DIR}${DEST_SHARE_DOC}/README -+ chmod 644 ${DEST_DIR}${DEST_SHARE_DOC}/README - fi - - if [ -f ChangeLog ] -@@ -160,7 +152,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - mkdir -p ${DEST_DIR}${DEST_SHARE_DOC} - cp ChangeLog ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog -- chmod 444 ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog -+ chmod 644 ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog - fi - - if [ -d DOCS ] -@@ -168,7 +160,7 @@ then - echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" - mkdir -p ${DEST_DIR}${DEST_SHARE_DOC} - cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -- find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \; -- find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \; -+ find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 755 {} \; -+ find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 644 {} \; - fi - diff --git a/p7zip_4.58-install.patch b/p7zip_4.58-install.patch new file mode 100644 index 0000000..078cf05 --- /dev/null +++ b/p7zip_4.58-install.patch @@ -0,0 +1,142 @@ +diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh +--- p7zip_4.58.orig/install.sh 2008-03-02 14:35:05.000000000 +0100 ++++ p7zip_4.58/install.sh 2008-06-18 14:02:45.000000000 +0200 +@@ -54,49 +54,41 @@ then + then + echo "- installing ${DEST_DIR}${DEST_BIN}/7za" + cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za" +- chmod 777 "${DEST_DIR}${DEST_SHARE}/7za" +- strip "${DEST_DIR}${DEST_SHARE}/7za" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7za" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7za" + echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za" + echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" + fi + + if [ -x bin/7zr ] + then + echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" + cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr" +- chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr" +- strip "${DEST_DIR}${DEST_SHARE}/7zr" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr" + echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr" + echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" + fi + + if [ -x bin/7zCon.sfx ] + then + echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx" + cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" +- chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" +- strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" + fi + + if [ -x bin/7z ] + then + echo "- installing ${DEST_DIR}${DEST_BIN}/7z" + cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z" +- chmod 777 "${DEST_DIR}${DEST_SHARE}/7z" +- strip "${DEST_DIR}${DEST_SHARE}/7z" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z" + cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/" +- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/* ++ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/* + cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so" + echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z" + echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7z" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7z" + fi + + else +@@ -105,7 +97,7 @@ else + echo "- installing ${DEST_DIR}${DEST_BIN}/7za" + mkdir -p "${DEST_DIR}${DEST_BIN}" + cp bin/7za "${DEST_DIR}${DEST_BIN}/7za" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" + fi + + if [ -x bin/7zr ] +@@ -113,7 +105,7 @@ else + echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" + mkdir -p "${DEST_DIR}${DEST_BIN}" + cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr" +- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" + fi + fi + +@@ -122,27 +114,27 @@ if [ -d DOCS ] + then + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" + sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" + else + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" + grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" + grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" + + echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" + grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" +- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" ++ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" + fi + + if [ -f README ] +@@ -150,7 +142,7 @@ then + echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" + mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" + cp README "${DEST_DIR}${DEST_SHARE_DOC}/README" +- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README" ++ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README" + fi + + if [ -f ChangeLog ] +@@ -158,7 +150,7 @@ then + echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" + mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" + cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" +- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" ++ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" + fi + + if [ -d DOCS ] +@@ -166,7 +158,7 @@ then + echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" + mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" + cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" +- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \; +- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \; ++ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \; ++ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \; + fi + diff --git a/p7zip_4.51-norar.patch b/p7zip_4.58-norar.patch similarity index 73% rename from p7zip_4.51-norar.patch rename to p7zip_4.58-norar.patch index 798ed92..a4944ce 100644 --- a/p7zip_4.51-norar.patch +++ b/p7zip_4.58-norar.patch @@ -1,17 +1,17 @@ -diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile 2007-07-24 21:02:45.000000000 +0200 -+++ p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile 2007-08-05 17:49:13.000000000 +0200 -@@ -85,9 +85,6 @@ Pbkdf2HmacSha1.o \ +diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile 2008-05-06 21:50:19.000000000 +0200 ++++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile 2008-06-18 13:03:07.000000000 +0200 +@@ -79,9 +79,6 @@ HmacSha1.o \ + Pbkdf2HmacSha1.o \ RandGen.o \ Sha1.o \ - Sha256.o \ -RarAES.o \ -Rar20Cipher.o \ -Rar20Crypto.o \ WzAES.o \ ZipCipher.o \ ZipCrypto.o \ -@@ -126,12 +123,6 @@ StreamUtils.o \ +@@ -120,12 +117,6 @@ StreamUtils.o \ 7zRegister.o \ 7zSpecStream.o \ 7zUpdate.o \ @@ -24,10 +24,10 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.51/CP ArjHandler.o \ ArjIn.o \ ArjRegister.o \ -diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-07-24 21:08:44.000000000 +0200 -+++ p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile.list 2007-08-05 17:49:47.000000000 +0200 -@@ -48,11 +48,6 @@ SRCS=\ +diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-05-08 10:27:51.000000000 +0200 ++++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-06-18 13:03:56.000000000 +0200 +@@ -44,11 +44,6 @@ SRCS=\ ../../Compress/BZip2/BZip2Decoder.cpp \ ../../Compress/BZip2/BZip2Encoder.cpp \ ../../Compress/BZip2/BZip2Register.cpp \ @@ -36,20 +36,20 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - ../../Compress/Rar/Rar3Decoder.cpp \ - ../../Compress/Rar/Rar3Vm.cpp \ - ../../Compress/Rar/RarCodecsRegister.cpp \ - ../../Compress/BWT/BlockSort.cpp \ ../../Compress/Implode/ImplodeDecoder.cpp \ ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \ -@@ -74,9 +69,6 @@ SRCS=\ + ../../Compress/Lzx/Lzx86Converter.cpp \ +@@ -68,9 +63,6 @@ SRCS=\ + ../../Crypto/Hash/Pbkdf2HmacSha1.cpp \ ../../Crypto/Hash/RandGen.cpp \ ../../Crypto/Hash/Sha1.cpp \ - ../../Crypto/Hash/Sha256.cpp \ - ../../Crypto/RarAES/RarAES.cpp \ - ../../Crypto/Rar20/Rar20Cipher.cpp \ - ../../Crypto/Rar20/Rar20Crypto.cpp \ ../../Crypto/WzAES/WzAES.cpp \ ../../Crypto/Zip/ZipCipher.cpp \ ../../Crypto/Zip/ZipCrypto.cpp \ -@@ -115,12 +107,6 @@ SRCS=\ +@@ -109,12 +101,6 @@ SRCS=\ ../../Archive/7z/7zRegister.cpp \ ../../Archive/7z/7zSpecStream.cpp \ ../../Archive/7z/7zUpdate.cpp \ @@ -62,7 +62,7 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Archive/Arj/ArjHandler.cpp \ ../../Archive/Arj/ArjIn.cpp \ ../../Archive/Arj/ArjRegister.cpp \ -@@ -330,16 +316,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ +@@ -324,16 +310,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp @@ -76,13 +76,13 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp -RarCodecsRegister.o : ../../Compress/Rar/RarCodecsRegister.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp - BlockSort.o : ../../Compress/BWT/BlockSort.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BWT/BlockSort.cpp ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp -@@ -382,12 +358,6 @@ Sha1.o : ../../Crypto/Hash/Sha1.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Implode/ImplodeDecoder.cpp + ImplodeHuffmanDecoder.o : ../../Compress/Implode/ImplodeHuffmanDecoder.cpp +@@ -372,12 +348,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/RandGen.cpp + Sha1.o : ../../Crypto/Hash/Sha1.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp - Sha256.o : ../../Crypto/Hash/Sha256.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha256.cpp -RarAES.o : ../../Crypto/RarAES/RarAES.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp -Rar20Cipher.o : ../../Crypto/Rar20/Rar20Cipher.cpp @@ -92,7 +92,7 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. WzAES.o : ../../Crypto/WzAES/WzAES.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp -@@ -464,18 +434,6 @@ StreamUtils.o : ../../Common/StreamUtils +@@ -454,18 +424,6 @@ StreamUtils.o : ../../Common/StreamUtils $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp 7zUpdate.o : ../../Archive/7z/7zUpdate.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp @@ -111,30 +111,30 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ArjHandler.o : ../../Archive/Arj/ArjHandler.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp ArjIn.o : ../../Archive/Arj/ArjIn.cpp -diff -Naupr p7zip_4.51.orig/makefile p7zip_4.51/makefile ---- p7zip_4.51.orig/makefile 2007-06-30 09:25:51.000000000 +0200 -+++ p7zip_4.51/makefile 2007-08-05 17:50:16.000000000 +0200 -@@ -38,7 +38,6 @@ depend: +diff -Naupr p7zip_4.58.orig/makefile p7zip_4.58/makefile +--- p7zip_4.58.orig/makefile 2008-05-18 13:34:05.000000000 +0200 ++++ p7zip_4.58/makefile 2008-06-18 13:04:17.000000000 +0200 +@@ -41,7 +41,6 @@ depend: cd CPP/7zip/UI/Client7z ; $(MAKE) depend cd CPP/7zip/UI/Console ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend sfx: common - mkdir -p bin -@@ -48,7 +47,6 @@ sfx: common - mkdir -p bin/Codecs + $(MKDIR) bin +@@ -51,7 +50,6 @@ sfx: common + $(MKDIR) bin/Codecs cd CPP/7zip/UI/Console ; $(MAKE) all cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all - cd CPP/7zip/Compress/Rar ; $(MAKE) all clean: cd CPP/myWindows ; $(MAKE) clean -@@ -58,7 +56,6 @@ clean: +@@ -61,7 +59,6 @@ clean: cd CPP/7zip/UI/Client7z ; $(MAKE) clean cd CPP/7zip/UI/Console ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean + cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean - rm -fr bin diff --git a/sources b/sources index b507337..7712154 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f56f89b77f77f2e7661109a88ecddce3 p7zip_4.51_src_all-norar.tar.bz2 +29d06b768154d114de31bedd1dfd57c8 p7zip_4.58_src_all-norar.tar.bz2 From cf01096ebd1a1c2884a1230b99804f443f31f4ad Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 23 Dec 2008 15:46:55 +0000 Subject: [PATCH 23/86] Update to 4.61 and use asm for x86 too. --- .cvsignore | 2 +- p7zip.spec | 19 ++++-- ...4.58-norar.patch => p7zip_4.61-norar.patch | 68 +++++++++---------- sources | 2 +- 4 files changed, 51 insertions(+), 40 deletions(-) rename p7zip_4.58-norar.patch => p7zip_4.61-norar.patch (72%) diff --git a/.cvsignore b/.cvsignore index 2ede8b2..5832f36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.58_src_all-norar.tar.bz2 +p7zip_4.61_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 1c40777..a1e78a5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,6 +1,6 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.58 +Version: 4.61 Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) @@ -14,10 +14,13 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_4.58-norar.patch +Patch0: p7zip_4.61-norar.patch Patch1: p7zip_4.58-install.patch Patch2: p7zip_4.51-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +%ifarch %{ix86} +BuildRequires: nasm +%endif %ifarch x86_64 BuildRequires: yasm %endif @@ -52,12 +55,15 @@ find contrib -type f -exec chmod -x {} \; %build -%ifarch %{ix86} ppc ppc64 -%{__cp} -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine +%ifarch %{ix86} +%{__cp} -f makefile.linux_x86_asm_gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64_asm makefile.machine %endif +%ifarch ppc ppc64 +%{__cp} -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine +%endif # Don't use _smp_mflags since the build sometimes fails with it (as of 4.44) %{__make} %{?_smp_mflags} all2 \ @@ -104,6 +110,11 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Tue Dec 23 2008 Matthias Saou 4.61-1 +- Update to 4.61. +- Update norar patch. +- Use asm for x86 too (nasm). + * Wed Jun 18 2008 Matthias Saou 4.58-1 - Update to 4.58. - Update norar patch. diff --git a/p7zip_4.58-norar.patch b/p7zip_4.61-norar.patch similarity index 72% rename from p7zip_4.58-norar.patch rename to p7zip_4.61-norar.patch index a4944ce..d5a85eb 100644 --- a/p7zip_4.58-norar.patch +++ b/p7zip_4.61-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile 2008-05-06 21:50:19.000000000 +0200 -+++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile 2008-06-18 13:03:07.000000000 +0200 -@@ -79,9 +79,6 @@ HmacSha1.o \ +diff -Naupr p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile 2008-11-28 21:17:16.000000000 +0100 ++++ p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile 2008-12-23 16:27:04.927434325 +0100 +@@ -83,9 +83,6 @@ HmacSha1.o \ Pbkdf2HmacSha1.o \ RandGen.o \ Sha1.o \ @@ -11,7 +11,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CP WzAES.o \ ZipCipher.o \ ZipCrypto.o \ -@@ -120,12 +117,6 @@ StreamUtils.o \ +@@ -124,12 +121,6 @@ StreamUtils.o \ 7zRegister.o \ 7zSpecStream.o \ 7zUpdate.o \ @@ -21,13 +21,13 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CP -RarItem.o \ -RarRegister.o \ -RarVolumeInStream.o \ - ArjHandler.o \ - ArjIn.o \ - ArjRegister.o \ -diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-05-08 10:27:51.000000000 +0200 -+++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-06-18 13:03:56.000000000 +0200 -@@ -44,11 +44,6 @@ SRCS=\ + bz2Register.o \ + BZip2Handler.o \ + BZip2HandlerOut.o \ +diff -Naupr p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-08-14 16:45:27.000000000 +0200 ++++ p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-12-23 16:28:13.942309528 +0100 +@@ -51,11 +51,6 @@ SRCS=\ ../../Compress/BZip2/BZip2Decoder.cpp \ ../../Compress/BZip2/BZip2Encoder.cpp \ ../../Compress/BZip2/BZip2Register.cpp \ @@ -39,7 +39,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Compress/Implode/ImplodeDecoder.cpp \ ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \ ../../Compress/Lzx/Lzx86Converter.cpp \ -@@ -68,9 +63,6 @@ SRCS=\ +@@ -72,9 +67,6 @@ SRCS=\ ../../Crypto/Hash/Pbkdf2HmacSha1.cpp \ ../../Crypto/Hash/RandGen.cpp \ ../../Crypto/Hash/Sha1.cpp \ @@ -49,7 +49,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Crypto/WzAES/WzAES.cpp \ ../../Crypto/Zip/ZipCipher.cpp \ ../../Crypto/Zip/ZipCrypto.cpp \ -@@ -109,12 +101,6 @@ SRCS=\ +@@ -113,12 +105,6 @@ SRCS=\ ../../Archive/7z/7zRegister.cpp \ ../../Archive/7z/7zSpecStream.cpp \ ../../Archive/7z/7zUpdate.cpp \ @@ -59,10 +59,10 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - ../../Archive/Rar/RarItem.cpp \ - ../../Archive/Rar/RarRegister.cpp \ - ../../Archive/Rar/RarVolumeInStream.cpp \ - ../../Archive/Arj/ArjHandler.cpp \ - ../../Archive/Arj/ArjIn.cpp \ - ../../Archive/Arj/ArjRegister.cpp \ -@@ -324,16 +310,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ + ../../Archive/BZip2/bz2Register.cpp \ + ../../Archive/BZip2/BZip2Handler.cpp \ + ../../Archive/BZip2/BZip2HandlerOut.cpp \ +@@ -347,16 +333,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp @@ -79,7 +79,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Implode/ImplodeDecoder.cpp ImplodeHuffmanDecoder.o : ../../Compress/Implode/ImplodeHuffmanDecoder.cpp -@@ -372,12 +348,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp +@@ -391,12 +367,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/RandGen.cpp Sha1.o : ../../Crypto/Hash/Sha1.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp @@ -92,7 +92,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. WzAES.o : ../../Crypto/WzAES/WzAES.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp -@@ -454,18 +424,6 @@ StreamUtils.o : ../../Common/StreamUtils +@@ -473,18 +443,6 @@ StreamUtils.o : ../../Common/StreamUtils $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp 7zUpdate.o : ../../Archive/7z/7zUpdate.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp @@ -108,31 +108,31 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp -RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp - ArjHandler.o : ../../Archive/Arj/ArjHandler.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp - ArjIn.o : ../../Archive/Arj/ArjIn.cpp -diff -Naupr p7zip_4.58.orig/makefile p7zip_4.58/makefile ---- p7zip_4.58.orig/makefile 2008-05-18 13:34:05.000000000 +0200 -+++ p7zip_4.58/makefile 2008-06-18 13:04:17.000000000 +0200 -@@ -41,7 +41,6 @@ depend: - cd CPP/7zip/UI/Client7z ; $(MAKE) depend + bz2Register.o : ../../Archive/BZip2/bz2Register.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/BZip2/bz2Register.cpp + BZip2Handler.o : ../../Archive/BZip2/BZip2Handler.cpp +diff -Naupr p7zip_4.61.orig/makefile p7zip_4.61/makefile +--- p7zip_4.61.orig/makefile 2008-11-30 16:49:38.000000000 +0100 ++++ p7zip_4.61/makefile 2008-12-23 16:28:49.215386938 +0100 +@@ -42,7 +42,6 @@ depend: cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/UI/GUI ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend sfx: common $(MKDIR) bin @@ -51,7 +50,6 @@ sfx: common + common7z:common $(MKDIR) bin/Codecs - cd CPP/7zip/UI/Console ; $(MAKE) all cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all - cd CPP/7zip/Compress/Rar ; $(MAKE) all - clean: - cd CPP/myWindows ; $(MAKE) clean -@@ -61,7 +59,6 @@ clean: - cd CPP/7zip/UI/Client7z ; $(MAKE) clean - cd CPP/7zip/UI/Console ; $(MAKE) clean + 7z: common7z + cd CPP/7zip/UI/Console ; $(MAKE) all +@@ -71,7 +69,6 @@ clean: + cd CPP/7zip/UI/FileManager ; $(MAKE) clean + cd CPP/7zip/UI/GUI ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean diff --git a/sources b/sources index 7712154..f458094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29d06b768154d114de31bedd1dfd57c8 p7zip_4.58_src_all-norar.tar.bz2 +3e787d5f0414f062c1834586c2562bd4 p7zip_4.61_src_all-norar.tar.bz2 From d15ce1d135e69ab0936e16d003019f69fe4b49b5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 09:18:57 +0000 Subject: [PATCH 24/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index a1e78a5..043ba3c 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.61 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -110,6 +110,9 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 4.61-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 23 2008 Matthias Saou 4.61-1 - Update to 4.61. - Update norar patch. From 5bebc98dced0cedbb3d9eeb6a519c3d50974c4ea Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sun, 12 Apr 2009 18:58:38 +0000 Subject: [PATCH 25/86] Update to 4.65. --- .cvsignore | 2 +- p7zip.spec | 15 +++-- p7zip_4.61-norar.patch | 140 ----------------------------------------- p7zip_4.65-norar.patch | 102 ++++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 114 insertions(+), 147 deletions(-) delete mode 100644 p7zip_4.61-norar.patch create mode 100644 p7zip_4.65-norar.patch diff --git a/.cvsignore b/.cvsignore index 5832f36..a356442 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.61_src_all-norar.tar.bz2 +p7zip_4.65_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 043ba3c..d7edcc0 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,20 +1,21 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.61 -Release: 2%{?dist} +Version: 4.65 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ # RAR sources removed since their license is incompatible with the LGPL -#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 +#Source: http://downloads.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2 # VERSION= +# wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 # rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar* # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_4.61-norar.patch +Patch0: p7zip_4.65-norar.patch Patch1: p7zip_4.58-install.patch Patch2: p7zip_4.51-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -110,7 +111,11 @@ find contrib -type f -exec chmod -x {} \; %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 4.61-2 +* Sun Apr 12 2009 Matthias Saou 4.65-1 +- Update to 4.65. +- Update norar patch. + +* Thu Feb 26 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Tue Dec 23 2008 Matthias Saou 4.61-1 diff --git a/p7zip_4.61-norar.patch b/p7zip_4.61-norar.patch deleted file mode 100644 index d5a85eb..0000000 --- a/p7zip_4.61-norar.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naupr p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile 2008-11-28 21:17:16.000000000 +0100 -+++ p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile 2008-12-23 16:27:04.927434325 +0100 -@@ -83,9 +83,6 @@ HmacSha1.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ - Sha1.o \ --RarAES.o \ --Rar20Cipher.o \ --Rar20Crypto.o \ - WzAES.o \ - ZipCipher.o \ - ZipCrypto.o \ -@@ -124,12 +121,6 @@ StreamUtils.o \ - 7zRegister.o \ - 7zSpecStream.o \ - 7zUpdate.o \ --RarHandler.o \ --RarHeader.o \ --RarIn.o \ --RarItem.o \ --RarRegister.o \ --RarVolumeInStream.o \ - bz2Register.o \ - BZip2Handler.o \ - BZip2HandlerOut.o \ -diff -Naupr p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-08-14 16:45:27.000000000 +0200 -+++ p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-12-23 16:28:13.942309528 +0100 -@@ -51,11 +51,6 @@ SRCS=\ - ../../Compress/BZip2/BZip2Decoder.cpp \ - ../../Compress/BZip2/BZip2Encoder.cpp \ - ../../Compress/BZip2/BZip2Register.cpp \ -- ../../Compress/Rar/Rar1Decoder.cpp \ -- ../../Compress/Rar/Rar2Decoder.cpp \ -- ../../Compress/Rar/Rar3Decoder.cpp \ -- ../../Compress/Rar/Rar3Vm.cpp \ -- ../../Compress/Rar/RarCodecsRegister.cpp \ - ../../Compress/Implode/ImplodeDecoder.cpp \ - ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \ - ../../Compress/Lzx/Lzx86Converter.cpp \ -@@ -72,9 +67,6 @@ SRCS=\ - ../../Crypto/Hash/Pbkdf2HmacSha1.cpp \ - ../../Crypto/Hash/RandGen.cpp \ - ../../Crypto/Hash/Sha1.cpp \ -- ../../Crypto/RarAES/RarAES.cpp \ -- ../../Crypto/Rar20/Rar20Cipher.cpp \ -- ../../Crypto/Rar20/Rar20Crypto.cpp \ - ../../Crypto/WzAES/WzAES.cpp \ - ../../Crypto/Zip/ZipCipher.cpp \ - ../../Crypto/Zip/ZipCrypto.cpp \ -@@ -113,12 +105,6 @@ SRCS=\ - ../../Archive/7z/7zRegister.cpp \ - ../../Archive/7z/7zSpecStream.cpp \ - ../../Archive/7z/7zUpdate.cpp \ -- ../../Archive/Rar/RarHandler.cpp \ -- ../../Archive/Rar/RarHeader.cpp \ -- ../../Archive/Rar/RarIn.cpp \ -- ../../Archive/Rar/RarItem.cpp \ -- ../../Archive/Rar/RarRegister.cpp \ -- ../../Archive/Rar/RarVolumeInStream.cpp \ - ../../Archive/BZip2/bz2Register.cpp \ - ../../Archive/BZip2/BZip2Handler.cpp \ - ../../Archive/BZip2/BZip2HandlerOut.cpp \ -@@ -347,16 +333,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp - BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp --Rar1Decoder.o : ../../Compress/Rar/Rar1Decoder.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar1Decoder.cpp --Rar2Decoder.o : ../../Compress/Rar/Rar2Decoder.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar2Decoder.cpp --Rar3Decoder.o : ../../Compress/Rar/Rar3Decoder.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Decoder.cpp --Rar3Vm.o : ../../Compress/Rar/Rar3Vm.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp --RarCodecsRegister.o : ../../Compress/Rar/RarCodecsRegister.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp - ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Implode/ImplodeDecoder.cpp - ImplodeHuffmanDecoder.o : ../../Compress/Implode/ImplodeHuffmanDecoder.cpp -@@ -391,12 +367,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/RandGen.cpp - Sha1.o : ../../Crypto/Hash/Sha1.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp --RarAES.o : ../../Crypto/RarAES/RarAES.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp --Rar20Cipher.o : ../../Crypto/Rar20/Rar20Cipher.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Rar20/Rar20Cipher.cpp --Rar20Crypto.o : ../../Crypto/Rar20/Rar20Crypto.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Rar20/Rar20Crypto.cpp - WzAES.o : ../../Crypto/WzAES/WzAES.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp - ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp -@@ -473,18 +443,6 @@ StreamUtils.o : ../../Common/StreamUtils - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp - 7zUpdate.o : ../../Archive/7z/7zUpdate.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp --RarHandler.o : ../../Archive/Rar/RarHandler.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarHandler.cpp --RarHeader.o : ../../Archive/Rar/RarHeader.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarHeader.cpp --RarIn.o : ../../Archive/Rar/RarIn.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarIn.cpp --RarItem.o : ../../Archive/Rar/RarItem.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarItem.cpp --RarRegister.o : ../../Archive/Rar/RarRegister.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp --RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp -- $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp - bz2Register.o : ../../Archive/BZip2/bz2Register.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/BZip2/bz2Register.cpp - BZip2Handler.o : ../../Archive/BZip2/BZip2Handler.cpp -diff -Naupr p7zip_4.61.orig/makefile p7zip_4.61/makefile ---- p7zip_4.61.orig/makefile 2008-11-30 16:49:38.000000000 +0100 -+++ p7zip_4.61/makefile 2008-12-23 16:28:49.215386938 +0100 -@@ -42,7 +42,6 @@ depend: - cd CPP/7zip/UI/Console ; $(MAKE) depend - cd CPP/7zip/UI/GUI ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend -- cd CPP/7zip/Compress/Rar ; $(MAKE) depend - - sfx: common - $(MKDIR) bin -@@ -51,7 +50,6 @@ sfx: common - common7z:common - $(MKDIR) bin/Codecs - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all -- cd CPP/7zip/Compress/Rar ; $(MAKE) all - - 7z: common7z - cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -71,7 +69,6 @@ clean: - cd CPP/7zip/UI/FileManager ; $(MAKE) clean - cd CPP/7zip/UI/GUI ; $(MAKE) clean - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean -- cd CPP/7zip/Compress/Rar ; $(MAKE) clean - cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean - cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean - cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean diff --git a/p7zip_4.65-norar.patch b/p7zip_4.65-norar.patch new file mode 100644 index 0000000..fefca4b --- /dev/null +++ b/p7zip_4.65-norar.patch @@ -0,0 +1,102 @@ +diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 ++++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile 2009-04-12 20:47:44.973127047 +0200 +@@ -172,14 +172,6 @@ NSIS_OBJS = \ + NsisIn.o \ + NsisRegister.o \ + +-RAR_OBJS = \ +- RarHandler.o \ +- RarHeader.o \ +- RarIn.o \ +- RarItem.o \ +- RarVolumeInStream.o \ +- RarRegister.o \ +- + # SplitHandlerOut.o + SPLIT_OBJS = \ + SplitHandler.o \ +@@ -257,13 +249,6 @@ COMPRESS_OBJS = \ + ZlibDecoder.o \ + ZDecoder.o \ + +-COMPRESS_OBJS_NON_FREE = \ +- Rar1Decoder.o \ +- Rar2Decoder.o \ +- Rar3Decoder.o \ +- Rar3Vm.o \ +- RarCodecsRegister.o \ +- + CRYPTO_OBJS = \ + 7zAes.o \ + 7zAesRegister.o \ +@@ -271,8 +256,6 @@ CRYPTO_OBJS = \ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +@@ -315,7 +298,6 @@ OBJS = \ + $(LZH_OBJS) \ + $(LZM_OBJS) \ + $(NSIS_OBJS) \ +- $(RAR_OBJS) \ + $(SPLIT_OBJS) \ + $(TAR_OBJS) \ + $(UDF_OBJS) \ +diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-02-09 21:04:32.000000000 +0100 ++++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-04-12 20:47:04.713126284 +0200 +@@ -141,13 +141,6 @@ SRCS=\ + ../../Archive/Nsis/NsisIn.cpp \ + ../../Archive/Nsis/NsisRegister.cpp \ + \ +- ../../Archive/Rar/RarHandler.cpp \ +- ../../Archive/Rar/RarHeader.cpp \ +- ../../Archive/Rar/RarIn.cpp \ +- ../../Archive/Rar/RarItem.cpp \ +- ../../Archive/Rar/RarVolumeInStream.cpp \ +- ../../Archive/Rar/RarRegister.cpp \ +- \ + ../../Archive/Split/SplitHandler.cpp \ + ../../Archive/Split/SplitRegister.cpp \ + \ +@@ -229,8 +222,6 @@ SRCS=\ + ../../Crypto/RandGen.cpp \ + ../../Crypto/Sha1.cpp \ + ../../Crypto/WzAes.cpp \ +- ../../Crypto/Rar20Crypto.cpp \ +- ../../Crypto/RarAes.cpp \ + ../../Crypto/ZipCrypto.cpp \ + ../../Crypto/ZipStrong.cpp + +diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile +--- p7zip_4.65.orig/makefile 2009-02-14 17:03:50.000000000 +0100 ++++ p7zip_4.65/makefile 2009-04-12 20:48:21.342256593 +0200 +@@ -41,7 +41,6 @@ depend: + cd CPP/7zip/UI/Client7z ; $(MAKE) depend + cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend +- cd CPP/7zip/Compress/Rar ; $(MAKE) depend + cd CPP/7zip/UI/GUI ; $(MAKE) depend + + sfx: common +@@ -51,7 +50,6 @@ sfx: common + common7z:common + $(MKDIR) bin/Codecs + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all +- cd CPP/7zip/Compress/Rar ; $(MAKE) all + + 7z: common7z + cd CPP/7zip/UI/Console ; $(MAKE) all +@@ -71,7 +69,6 @@ clean: + cd CPP/7zip/UI/FileManager ; $(MAKE) clean + cd CPP/7zip/UI/GUI ; $(MAKE) clean + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean +- cd CPP/7zip/Compress/Rar ; $(MAKE) clean + cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean + cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean + cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean diff --git a/sources b/sources index f458094..b712885 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e787d5f0414f062c1834586c2562bd4 p7zip_4.61_src_all-norar.tar.bz2 +41e748eccdf42d1cc7f84d22c6fb815b p7zip_4.65_src_all-norar.tar.bz2 From 6f81bb35d0073fc577b3d4af1262f0b976ceb855 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 21:04:04 +0000 Subject: [PATCH 26/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index d7edcc0..329c7c6 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.65 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 4.65-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Apr 12 2009 Matthias Saou 4.65-1 - Update to 4.65. - Update norar patch. From 4b709c7a4de79a5ecc3633f3660f54e6d693dc28 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:30:18 +0000 Subject: [PATCH 27/86] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index adb763f..05d62f0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: p7zip -# $Id$ +# $Id: Makefile,v 1.1 2005/04/19 14:56:02 thias Exp $ NAME := p7zip SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6c3ac9ee9da4fd470cee2a1e7f62248a9ede7858 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:45:59 +0000 Subject: [PATCH 28/86] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index adb763f..05d62f0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: p7zip -# $Id$ +# $Id: Makefile,v 1.1 2005/04/19 14:56:02 thias Exp $ NAME := p7zip SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From ab30f97ae52098e8bcbef72da7860509265d06bc Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 8 Dec 2009 12:28:00 +0000 Subject: [PATCH 29/86] Update to 9.04. --- .cvsignore | 2 +- p7zip.spec | 10 ++-- ...4.65-norar.patch => p7zip_9.04-norar.patch | 48 +++++++++---------- sources | 2 +- 4 files changed, 33 insertions(+), 29 deletions(-) rename p7zip_4.65-norar.patch => p7zip_9.04-norar.patch (61%) diff --git a/.cvsignore b/.cvsignore index a356442..c58b1c6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.65_src_all-norar.tar.bz2 +p7zip_9.04_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 329c7c6..3beebe9 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.65 -Release: 2%{?dist} +Version: 9.04 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -15,7 +15,7 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_4.65-norar.patch +Patch0: p7zip_9.04-norar.patch Patch1: p7zip_4.58-install.patch Patch2: p7zip_4.51-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -111,6 +111,10 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Tue Dec 8 2009 Matthias Saou 9.04-1 +- Update to 9.04. +- Update norar patch. + * Sat Jul 25 2009 Fedora Release Engineering - 4.65-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/p7zip_4.65-norar.patch b/p7zip_9.04-norar.patch similarity index 61% rename from p7zip_4.65-norar.patch rename to p7zip_9.04-norar.patch index fefca4b..1c8ced6 100644 --- a/p7zip_4.65-norar.patch +++ b/p7zip_9.04-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 -+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile 2009-04-12 20:47:44.973127047 +0200 -@@ -172,14 +172,6 @@ NSIS_OBJS = \ +diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-06-04 21:06:49.000000000 +0200 ++++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2009-12-08 13:21:22.713559220 +0100 +@@ -150,14 +150,6 @@ NSIS_OBJS = \ NsisIn.o \ NsisRegister.o \ @@ -13,10 +13,10 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP - RarVolumeInStream.o \ - RarRegister.o \ - - # SplitHandlerOut.o - SPLIT_OBJS = \ - SplitHandler.o \ -@@ -257,13 +249,6 @@ COMPRESS_OBJS = \ + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -233,13 +225,6 @@ COMPRESS_OBJS = \ ZlibDecoder.o \ ZDecoder.o \ @@ -30,7 +30,7 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP CRYPTO_OBJS = \ 7zAes.o \ 7zAesRegister.o \ -@@ -271,8 +256,6 @@ CRYPTO_OBJS = \ +@@ -247,8 +232,6 @@ CRYPTO_OBJS = \ MyAes.o \ Pbkdf2HmacSha1.o \ RandGen.o \ @@ -39,18 +39,18 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP Sha1.o \ WzAes.o \ ZipCrypto.o \ -@@ -315,7 +298,6 @@ OBJS = \ - $(LZH_OBJS) \ - $(LZM_OBJS) \ +@@ -298,7 +281,6 @@ OBJS = \ + $(HFS_OBJS) \ + $(ISO_OBJS) \ $(NSIS_OBJS) \ - $(RAR_OBJS) \ - $(SPLIT_OBJS) \ $(TAR_OBJS) \ $(UDF_OBJS) \ -diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-02-09 21:04:32.000000000 +0100 -+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-04-12 20:47:04.713126284 +0200 -@@ -141,13 +141,6 @@ SRCS=\ + $(WIM_OBJS) \ +diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-06-04 21:01:21.000000000 +0200 ++++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-12-08 13:21:52.858319619 +0100 +@@ -124,13 +124,6 @@ SRCS=\ ../../Archive/Nsis/NsisIn.cpp \ ../../Archive/Nsis/NsisRegister.cpp \ \ @@ -61,10 +61,10 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - ../../Archive/Rar/RarVolumeInStream.cpp \ - ../../Archive/Rar/RarRegister.cpp \ - \ - ../../Archive/Split/SplitHandler.cpp \ - ../../Archive/Split/SplitRegister.cpp \ - \ -@@ -229,8 +222,6 @@ SRCS=\ + ../../Archive/Tar/TarHandler.cpp \ + ../../Archive/Tar/TarHandlerOut.cpp \ + ../../Archive/Tar/TarHeader.cpp \ +@@ -212,8 +205,6 @@ SRCS=\ ../../Crypto/RandGen.cpp \ ../../Crypto/Sha1.cpp \ ../../Crypto/WzAes.cpp \ @@ -73,9 +73,9 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Crypto/ZipCrypto.cpp \ ../../Crypto/ZipStrong.cpp -diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile ---- p7zip_4.65.orig/makefile 2009-02-14 17:03:50.000000000 +0100 -+++ p7zip_4.65/makefile 2009-04-12 20:48:21.342256593 +0200 +diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile +--- p7zip_9.04.orig/makefile 2009-06-04 20:28:50.000000000 +0200 ++++ p7zip_9.04/makefile 2009-12-08 13:22:30.120194667 +0100 @@ -41,7 +41,6 @@ depend: cd CPP/7zip/UI/Client7z ; $(MAKE) depend cd CPP/7zip/UI/Console ; $(MAKE) depend diff --git a/sources b/sources index b712885..e4bb4dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41e748eccdf42d1cc7f84d22c6fb815b p7zip_4.65_src_all-norar.tar.bz2 +8bc7e82ae226a77cd4c9bd8c30be1661 p7zip_9.04_src_all-norar.tar.bz2 From 13cb12d9804ce2e0b56e61d17be40b175a1f280f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:02:43 +0000 Subject: [PATCH 30/86] Initialize branch EL-6 for p7zip --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 69cb4404f5a5851eef0d8dfc298b5afa2fcf7226 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 8 Jul 2010 12:31:38 +0000 Subject: [PATCH 31/86] Update to 9.13. --- .cvsignore | 2 +- p7zip.spec | 10 +++-- p7zip_4.51-nostrip.patch | 24 ----------- ...9.04-norar.patch => p7zip_9.13-norar.patch | 42 +++++++++---------- p7zip_9.13-nostrip.patch | 36 ++++++++++++++++ sources | 2 +- 6 files changed, 66 insertions(+), 50 deletions(-) delete mode 100644 p7zip_4.51-nostrip.patch rename p7zip_9.04-norar.patch => p7zip_9.13-norar.patch (61%) create mode 100644 p7zip_9.13-nostrip.patch diff --git a/.cvsignore b/.cvsignore index c58b1c6..b82e31b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_9.04_src_all-norar.tar.bz2 +p7zip_9.13_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 3beebe9..c52aace 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,6 +1,6 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 9.04 +Version: 9.13 Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) @@ -15,9 +15,9 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_9.04-norar.patch +Patch0: p7zip_9.13-norar.patch Patch1: p7zip_4.58-install.patch -Patch2: p7zip_4.51-nostrip.patch +Patch2: p7zip_9.13-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch %{ix86} BuildRequires: nasm @@ -111,6 +111,10 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Thu Jul 8 2010 Matthias Saou 9.13-1 +- Update to 9.13. +- Update norar and nostrip patches. + * Tue Dec 8 2009 Matthias Saou 9.04-1 - Update to 9.04. - Update norar patch. diff --git a/p7zip_4.51-nostrip.patch b/p7zip_4.51-nostrip.patch deleted file mode 100644 index c7379d0..0000000 --- a/p7zip_4.51-nostrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr p7zip_4.51.orig/makefile.linux_amd64_asm p7zip_4.51/makefile.linux_amd64_asm ---- p7zip_4.51.orig/makefile.linux_amd64_asm 2007-06-28 09:32:30.000000000 +0200 -+++ p7zip_4.51/makefile.linux_amd64_asm 2007-08-05 17:52:20.000000000 +0200 -@@ -2,7 +2,7 @@ - OPTFLAGS=-O - - # use "-m32" to have a 32bits executable --ALLFLAGS=-m64 ${OPTFLAGS} -s \ -+ALLFLAGS=-m64 ${OPTFLAGS} \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) -diff -Naupr p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X ---- p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-28 09:33:43.000000000 +0200 -+++ p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-08-05 17:52:45.000000000 +0200 -@@ -5,7 +5,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -s \ -+ALLFLAGS=${OPTFLAGS} \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) diff --git a/p7zip_9.04-norar.patch b/p7zip_9.13-norar.patch similarity index 61% rename from p7zip_9.04-norar.patch rename to p7zip_9.13-norar.patch index 1c8ced6..d1c1b77 100644 --- a/p7zip_9.04-norar.patch +++ b/p7zip_9.13-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-06-04 21:06:49.000000000 +0200 -+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2009-12-08 13:21:22.713559220 +0100 -@@ -150,14 +150,6 @@ NSIS_OBJS = \ +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-03-16 20:49:21.000000000 +0100 ++++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile 2010-07-08 14:10:34.309397353 +0200 +@@ -156,14 +156,6 @@ NSIS_OBJS = \ NsisIn.o \ NsisRegister.o \ @@ -16,8 +16,8 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP TAR_OBJS = \ TarHandler.o \ TarHandlerOut.o \ -@@ -233,13 +225,6 @@ COMPRESS_OBJS = \ - ZlibDecoder.o \ +@@ -241,13 +233,6 @@ COMPRESS_OBJS = \ + ZlibEncoder.o \ ZDecoder.o \ -COMPRESS_OBJS_NON_FREE = \ @@ -30,7 +30,7 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP CRYPTO_OBJS = \ 7zAes.o \ 7zAesRegister.o \ -@@ -247,8 +232,6 @@ CRYPTO_OBJS = \ +@@ -255,8 +240,6 @@ CRYPTO_OBJS = \ MyAes.o \ Pbkdf2HmacSha1.o \ RandGen.o \ @@ -39,7 +39,7 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP Sha1.o \ WzAes.o \ ZipCrypto.o \ -@@ -298,7 +281,6 @@ OBJS = \ +@@ -312,7 +295,6 @@ OBJS = \ $(HFS_OBJS) \ $(ISO_OBJS) \ $(NSIS_OBJS) \ @@ -47,10 +47,10 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP $(TAR_OBJS) \ $(UDF_OBJS) \ $(WIM_OBJS) \ -diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-06-04 21:01:21.000000000 +0200 -+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-12-08 13:21:52.858319619 +0100 -@@ -124,13 +124,6 @@ SRCS=\ +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-03-16 20:50:11.000000000 +0100 ++++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-07-08 14:10:34.325397501 +0200 +@@ -131,13 +131,6 @@ SRCS=\ ../../Archive/Nsis/NsisIn.cpp \ ../../Archive/Nsis/NsisRegister.cpp \ \ @@ -64,7 +64,7 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9. ../../Archive/Tar/TarHandler.cpp \ ../../Archive/Tar/TarHandlerOut.cpp \ ../../Archive/Tar/TarHeader.cpp \ -@@ -212,8 +205,6 @@ SRCS=\ +@@ -218,8 +211,6 @@ SRCS=\ ../../Crypto/RandGen.cpp \ ../../Crypto/Sha1.cpp \ ../../Crypto/WzAes.cpp \ @@ -73,18 +73,18 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9. ../../Crypto/ZipCrypto.cpp \ ../../Crypto/ZipStrong.cpp -diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile ---- p7zip_9.04.orig/makefile 2009-06-04 20:28:50.000000000 +0200 -+++ p7zip_9.04/makefile 2009-12-08 13:22:30.120194667 +0100 -@@ -41,7 +41,6 @@ depend: +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/makefile p7zip_9.13/makefile +--- p7zip_9.13.orig/makefile 2010-04-04 21:12:39.000000000 +0200 ++++ p7zip_9.13/makefile 2010-07-08 14:10:34.326397745 +0200 +@@ -52,7 +52,6 @@ depend: cd CPP/7zip/UI/Client7z ; $(MAKE) depend cd CPP/7zip/UI/Console ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend cd CPP/7zip/UI/GUI ; $(MAKE) depend + cd CPP/7zip/UI/FileManager ; $(MAKE) depend - sfx: common -@@ -51,7 +50,6 @@ sfx: common +@@ -63,7 +62,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all @@ -92,11 +92,11 @@ diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile 7z: common7z cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -71,7 +69,6 @@ clean: +@@ -88,7 +86,6 @@ clean: cd CPP/7zip/UI/FileManager ; $(MAKE) clean cd CPP/7zip/UI/GUI ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean - cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean + cd CPP/7zip/TEST/TestUI ; $(MAKE) clean diff --git a/p7zip_9.13-nostrip.patch b/p7zip_9.13-nostrip.patch new file mode 100644 index 0000000..93c2585 --- /dev/null +++ b/p7zip_9.13-nostrip.patch @@ -0,0 +1,36 @@ +diff -Naupr p7zip_9.13.orig/makefile.linux_amd64_asm p7zip_9.13/makefile.linux_amd64_asm +--- p7zip_9.13.orig/makefile.linux_amd64_asm 2009-12-22 19:11:03.000000000 +0100 ++++ p7zip_9.13/makefile.linux_amd64_asm 2010-07-08 14:12:33.197398954 +0200 +@@ -2,7 +2,7 @@ + OPTFLAGS=-O + + # use "-m32" to have a 32bits executable +-ALLFLAGS=-m64 ${OPTFLAGS} -pipe -s \ ++ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X p7zip_9.13/makefile.linux_x86_asm_gcc_4.X +--- p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X 2009-12-22 19:12:54.000000000 +0100 ++++ p7zip_9.13/makefile.linux_x86_asm_gcc_4.X 2010-07-08 14:13:36.185397479 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -m32 -s \ ++ALLFLAGS=${OPTFLAGS} -pipe -m32 \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X +--- p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2009-12-22 19:13:27.000000000 +0100 ++++ p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X 2010-07-08 14:13:49.211397922 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -s \ ++ALLFLAGS=${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ diff --git a/sources b/sources index e4bb4dd..3fbc309 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bc7e82ae226a77cd4c9bd8c30be1661 p7zip_9.04_src_all-norar.tar.bz2 +a5790ee20098763841ff87fefefb0ff3 p7zip_9.13_src_all-norar.tar.bz2 From 6977bf030ac0916bc495709da5cbb98c84dac5a0 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 12 Jul 2010 08:46:57 +0000 Subject: [PATCH 32/86] Update to 9.13. --- .cvsignore | 2 +- p7zip.spec | 16 +++-- p7zip_4.51-nostrip.patch | 24 -------- ...4.65-norar.patch => p7zip_9.13-norar.patch | 60 +++++++++---------- p7zip_9.13-nostrip.patch | 36 +++++++++++ sources | 2 +- 6 files changed, 80 insertions(+), 60 deletions(-) delete mode 100644 p7zip_4.51-nostrip.patch rename p7zip_4.65-norar.patch => p7zip_9.13-norar.patch (55%) create mode 100644 p7zip_9.13-nostrip.patch diff --git a/.cvsignore b/.cvsignore index a356442..b82e31b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.65_src_all-norar.tar.bz2 +p7zip_9.13_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 329c7c6..c52aace 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.65 -Release: 2%{?dist} +Version: 9.13 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -15,9 +15,9 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_4.65-norar.patch +Patch0: p7zip_9.13-norar.patch Patch1: p7zip_4.58-install.patch -Patch2: p7zip_4.51-nostrip.patch +Patch2: p7zip_9.13-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch %{ix86} BuildRequires: nasm @@ -111,6 +111,14 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Thu Jul 8 2010 Matthias Saou 9.13-1 +- Update to 9.13. +- Update norar and nostrip patches. + +* Tue Dec 8 2009 Matthias Saou 9.04-1 +- Update to 9.04. +- Update norar patch. + * Sat Jul 25 2009 Fedora Release Engineering - 4.65-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/p7zip_4.51-nostrip.patch b/p7zip_4.51-nostrip.patch deleted file mode 100644 index c7379d0..0000000 --- a/p7zip_4.51-nostrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr p7zip_4.51.orig/makefile.linux_amd64_asm p7zip_4.51/makefile.linux_amd64_asm ---- p7zip_4.51.orig/makefile.linux_amd64_asm 2007-06-28 09:32:30.000000000 +0200 -+++ p7zip_4.51/makefile.linux_amd64_asm 2007-08-05 17:52:20.000000000 +0200 -@@ -2,7 +2,7 @@ - OPTFLAGS=-O - - # use "-m32" to have a 32bits executable --ALLFLAGS=-m64 ${OPTFLAGS} -s \ -+ALLFLAGS=-m64 ${OPTFLAGS} \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) -diff -Naupr p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X ---- p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-28 09:33:43.000000000 +0200 -+++ p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-08-05 17:52:45.000000000 +0200 -@@ -5,7 +5,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -s \ -+ALLFLAGS=${OPTFLAGS} \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) diff --git a/p7zip_4.65-norar.patch b/p7zip_9.13-norar.patch similarity index 55% rename from p7zip_4.65-norar.patch rename to p7zip_9.13-norar.patch index fefca4b..d1c1b77 100644 --- a/p7zip_4.65-norar.patch +++ b/p7zip_9.13-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 -+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile 2009-04-12 20:47:44.973127047 +0200 -@@ -172,14 +172,6 @@ NSIS_OBJS = \ +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-03-16 20:49:21.000000000 +0100 ++++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile 2010-07-08 14:10:34.309397353 +0200 +@@ -156,14 +156,6 @@ NSIS_OBJS = \ NsisIn.o \ NsisRegister.o \ @@ -13,11 +13,11 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP - RarVolumeInStream.o \ - RarRegister.o \ - - # SplitHandlerOut.o - SPLIT_OBJS = \ - SplitHandler.o \ -@@ -257,13 +249,6 @@ COMPRESS_OBJS = \ - ZlibDecoder.o \ + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -241,13 +233,6 @@ COMPRESS_OBJS = \ + ZlibEncoder.o \ ZDecoder.o \ -COMPRESS_OBJS_NON_FREE = \ @@ -30,7 +30,7 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP CRYPTO_OBJS = \ 7zAes.o \ 7zAesRegister.o \ -@@ -271,8 +256,6 @@ CRYPTO_OBJS = \ +@@ -255,8 +240,6 @@ CRYPTO_OBJS = \ MyAes.o \ Pbkdf2HmacSha1.o \ RandGen.o \ @@ -39,18 +39,18 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP Sha1.o \ WzAes.o \ ZipCrypto.o \ -@@ -315,7 +298,6 @@ OBJS = \ - $(LZH_OBJS) \ - $(LZM_OBJS) \ +@@ -312,7 +295,6 @@ OBJS = \ + $(HFS_OBJS) \ + $(ISO_OBJS) \ $(NSIS_OBJS) \ - $(RAR_OBJS) \ - $(SPLIT_OBJS) \ $(TAR_OBJS) \ $(UDF_OBJS) \ -diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-02-09 21:04:32.000000000 +0100 -+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-04-12 20:47:04.713126284 +0200 -@@ -141,13 +141,6 @@ SRCS=\ + $(WIM_OBJS) \ +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-03-16 20:50:11.000000000 +0100 ++++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-07-08 14:10:34.325397501 +0200 +@@ -131,13 +131,6 @@ SRCS=\ ../../Archive/Nsis/NsisIn.cpp \ ../../Archive/Nsis/NsisRegister.cpp \ \ @@ -61,10 +61,10 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - ../../Archive/Rar/RarVolumeInStream.cpp \ - ../../Archive/Rar/RarRegister.cpp \ - \ - ../../Archive/Split/SplitHandler.cpp \ - ../../Archive/Split/SplitRegister.cpp \ - \ -@@ -229,8 +222,6 @@ SRCS=\ + ../../Archive/Tar/TarHandler.cpp \ + ../../Archive/Tar/TarHandlerOut.cpp \ + ../../Archive/Tar/TarHeader.cpp \ +@@ -218,8 +211,6 @@ SRCS=\ ../../Crypto/RandGen.cpp \ ../../Crypto/Sha1.cpp \ ../../Crypto/WzAes.cpp \ @@ -73,18 +73,18 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Crypto/ZipCrypto.cpp \ ../../Crypto/ZipStrong.cpp -diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile ---- p7zip_4.65.orig/makefile 2009-02-14 17:03:50.000000000 +0100 -+++ p7zip_4.65/makefile 2009-04-12 20:48:21.342256593 +0200 -@@ -41,7 +41,6 @@ depend: +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/makefile p7zip_9.13/makefile +--- p7zip_9.13.orig/makefile 2010-04-04 21:12:39.000000000 +0200 ++++ p7zip_9.13/makefile 2010-07-08 14:10:34.326397745 +0200 +@@ -52,7 +52,6 @@ depend: cd CPP/7zip/UI/Client7z ; $(MAKE) depend cd CPP/7zip/UI/Console ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend cd CPP/7zip/UI/GUI ; $(MAKE) depend + cd CPP/7zip/UI/FileManager ; $(MAKE) depend - sfx: common -@@ -51,7 +50,6 @@ sfx: common +@@ -63,7 +62,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all @@ -92,11 +92,11 @@ diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile 7z: common7z cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -71,7 +69,6 @@ clean: +@@ -88,7 +86,6 @@ clean: cd CPP/7zip/UI/FileManager ; $(MAKE) clean cd CPP/7zip/UI/GUI ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean - cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean + cd CPP/7zip/TEST/TestUI ; $(MAKE) clean diff --git a/p7zip_9.13-nostrip.patch b/p7zip_9.13-nostrip.patch new file mode 100644 index 0000000..93c2585 --- /dev/null +++ b/p7zip_9.13-nostrip.patch @@ -0,0 +1,36 @@ +diff -Naupr p7zip_9.13.orig/makefile.linux_amd64_asm p7zip_9.13/makefile.linux_amd64_asm +--- p7zip_9.13.orig/makefile.linux_amd64_asm 2009-12-22 19:11:03.000000000 +0100 ++++ p7zip_9.13/makefile.linux_amd64_asm 2010-07-08 14:12:33.197398954 +0200 +@@ -2,7 +2,7 @@ + OPTFLAGS=-O + + # use "-m32" to have a 32bits executable +-ALLFLAGS=-m64 ${OPTFLAGS} -pipe -s \ ++ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X p7zip_9.13/makefile.linux_x86_asm_gcc_4.X +--- p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X 2009-12-22 19:12:54.000000000 +0100 ++++ p7zip_9.13/makefile.linux_x86_asm_gcc_4.X 2010-07-08 14:13:36.185397479 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -m32 -s \ ++ALLFLAGS=${OPTFLAGS} -pipe -m32 \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X +--- p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2009-12-22 19:13:27.000000000 +0100 ++++ p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X 2010-07-08 14:13:49.211397922 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -s \ ++ALLFLAGS=${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ diff --git a/sources b/sources index b712885..3fbc309 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41e748eccdf42d1cc7f84d22c6fb815b p7zip_4.65_src_all-norar.tar.bz2 +a5790ee20098763841ff87fefefb0ff3 p7zip_9.13_src_all-norar.tar.bz2 From 9bfbacca79cce3aa11f23af309fbdbcf5d73065f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 05:25:08 +0000 Subject: [PATCH 33/86] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 05d62f0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: p7zip -# $Id: Makefile,v 1.1 2005/04/19 14:56:02 thias Exp $ -NAME := p7zip -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 0ae5769e16fa0f2e0654f832a6f5c49b78564c7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 05:25:11 +0000 Subject: [PATCH 34/86] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 05d62f0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: p7zip -# $Id: Makefile,v 1.1 2005/04/19 14:56:02 thias Exp $ -NAME := p7zip -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 9ce9b2dcc2d30bbe0ac6224e2ca9930aba48c83c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 07:52:03 -0600 Subject: [PATCH 35/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index c52aace..27c86f5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.13 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 9.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Thu Jul 8 2010 Matthias Saou 9.13-1 - Update to 9.13. - Update norar and nostrip patches. From 1cf05bcfce820ff128813c90a7f7c76f6d038a48 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 26 Jul 2011 14:59:27 +0200 Subject: [PATCH 36/86] Update to 9.20.1. --- .gitignore | 3 +- p7zip.spec | 77 ++++++------- p7zip_9.13-norar.patch | 102 ------------------ p7zip_9.13-nostrip.patch | 36 ------- ...nstall.patch => p7zip_9.20.1-install.patch | 87 ++++----------- p7zip_9.20.1-norar.patch | 102 ++++++++++++++++++ p7zip_9.20.1-nostrip.patch | 24 +++++ sources | 2 +- 8 files changed, 192 insertions(+), 241 deletions(-) delete mode 100644 p7zip_9.13-norar.patch delete mode 100644 p7zip_9.13-nostrip.patch rename p7zip_4.58-install.patch => p7zip_9.20.1-install.patch (54%) create mode 100644 p7zip_9.20.1-norar.patch create mode 100644 p7zip_9.20.1-nostrip.patch diff --git a/.gitignore b/.gitignore index b82e31b..570927e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -p7zip_9.13_src_all-norar.tar.bz2 +/p7zip_9.13_src_all-norar.tar.bz2 +/p7zip_9.20.1_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 27c86f5..5671b2e 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 9.13 -Release: 2%{?dist} +Version: 9.20.1 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -15,9 +15,9 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_9.13-norar.patch -Patch1: p7zip_4.58-install.patch -Patch2: p7zip_9.13-nostrip.patch +Patch0: p7zip_9.20.1-norar.patch +Patch1: p7zip_9.20.1-install.patch +Patch2: p7zip_9.20.1-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch %{ix86} BuildRequires: nasm @@ -34,7 +34,6 @@ compression ratio. The original version can be found at http://www.7-zip.org/. %package plugins Summary: Additional plugins for p7zip Group: Applications/Archiving -Requires: %{name} = %{version}-%{release} %description plugins Additional plugins that can be used with 7z to extend its abilities. @@ -48,8 +47,8 @@ This package contains also a virtual file system for Midnight Commander. %patch2 -p1 -b .nostrip # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc -%{__mv} DOCS docs -%{__mv} ChangeLog README TODO docs/ +mv DOCS docs +mv ChangeLog README TODO docs/ # And fix useless executable bit while we're at it find docs -type f -exec chmod -x {} \; find contrib -type f -exec chmod -x {} \; @@ -57,17 +56,16 @@ find contrib -type f -exec chmod -x {} \; %build %ifarch %{ix86} -%{__cp} -f makefile.linux_x86_asm_gcc_4.X makefile.machine +cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine %endif %ifarch x86_64 -%{__cp} -f makefile.linux_amd64_asm makefile.machine +cp -f makefile.linux_amd64_asm makefile.machine %endif %ifarch ppc ppc64 -%{__cp} -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine +cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -# Don't use _smp_mflags since the build sometimes fails with it (as of 4.44) -%{__make} %{?_smp_mflags} all2 \ +make %{?_smp_mflags} all2 \ OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -76,8 +74,8 @@ find contrib -type f -exec chmod -x {} \; %install -%{__rm} -rf %{buildroot} -%{__make} install \ +rm -rf %{buildroot} +make install \ DEST_DIR=%{buildroot} \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -86,7 +84,7 @@ find contrib -type f -exec chmod -x {} \; %clean -%{__rm} -rf %{buildroot} +rm -rf %{buildroot} %files @@ -111,33 +109,40 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Tue Jul 26 2011 Matthias Saou 9.20.1-1 +- Update to 9.20.1 (#688564). +- Update norar, nostrip and install patches. +- Minor clean ups : Don't use trivial macros + new email address. +- Don't require the main package from the plugins package (#690551). +- Use the any_cpu_gcc_4.X makefile for ppc* since the ppc specific one is gone. + * Tue Feb 08 2011 Fedora Release Engineering - 9.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Thu Jul 8 2010 Matthias Saou 9.13-1 +* Thu Jul 8 2010 Matthias Saou 9.13-1 - Update to 9.13. - Update norar and nostrip patches. -* Tue Dec 8 2009 Matthias Saou 9.04-1 +* Tue Dec 8 2009 Matthias Saou 9.04-1 - Update to 9.04. - Update norar patch. * Sat Jul 25 2009 Fedora Release Engineering - 4.65-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Sun Apr 12 2009 Matthias Saou 4.65-1 +* Sun Apr 12 2009 Matthias Saou 4.65-1 - Update to 4.65. - Update norar patch. * Thu Feb 26 2009 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Tue Dec 23 2008 Matthias Saou 4.61-1 +* Tue Dec 23 2008 Matthias Saou 4.61-1 - Update to 4.61. - Update norar patch. - Use asm for x86 too (nasm). -* Wed Jun 18 2008 Matthias Saou 4.58-1 +* Wed Jun 18 2008 Matthias Saou 4.58-1 - Update to 4.58. - Update norar patch. - Update install patch. @@ -145,17 +150,17 @@ find contrib -type f -exec chmod -x {} \; * Tue Feb 19 2008 Fedora Release Engineering - Autorebuild for GCC 4.3 -* Wed Aug 22 2007 Matthias Saou 4.51-3 +* Wed Aug 22 2007 Matthias Saou 4.51-3 - Rebuild for new BuildID feature. -* Thu Aug 9 2007 Matthias Saou 4.51-2 +* Thu Aug 9 2007 Matthias Saou 4.51-2 - Update License field some more (LGPL+ to LGPLv2+). -* Sun Aug 5 2007 Matthias Saou 4.51-1 +* Sun Aug 5 2007 Matthias Saou 4.51-1 - Update to 4.51. - Update License field. -* Tue Jun 19 2007 Matthias Saou 4.47-1 +* Tue Jun 19 2007 Matthias Saou 4.47-1 - Update to 4.47. - Include now required patch to exclude removed Rar bits from makefiles. - Switch to using "make install" for installation... so patch and hack. @@ -164,38 +169,38 @@ find contrib -type f -exec chmod -x {} \; - Remove no longer included Codecs and Formats dirs (7z.so replaces them?). - Remove our wrapper scripts, since the install script creates its own. -* Thu Mar 1 2007 Matthias Saou 4.44-2 +* Thu Mar 1 2007 Matthias Saou 4.44-2 - Remove _smp_mflags since some builds fail with suspicious errors. -* Thu Mar 1 2007 Matthias Saou 4.44-1 +* Thu Mar 1 2007 Matthias Saou 4.44-1 - Update to 4.44. -* Mon Aug 28 2006 Matthias Saou 4.42-2 +* Mon Aug 28 2006 Matthias Saou 4.42-2 - FC6 rebuild. -* Thu Jun 29 2006 Matthias Saou 4.42-1 +* Thu Jun 29 2006 Matthias Saou 4.42-1 - Update to 4.42. -* Tue May 2 2006 Matthias Saou 4.39-1 +* Tue May 2 2006 Matthias Saou 4.39-1 - Update to 4.39. - Remove no longer needed gcc 4.1 patch. - Use the gcc_4.X makefile. - Remove RAR licensed files and RAR license itself (#190277). -* Mon Mar 6 2006 Matthias Saou 4.30-3 +* Mon Mar 6 2006 Matthias Saou 4.30-3 - FC5 rebuild. -* Thu Feb 9 2006 Matthias Saou 4.30-2 +* Thu Feb 9 2006 Matthias Saou 4.30-2 - Rebuild for new gcc/glibc. - Include gcc 4.1 patch for extra qualification errors. -* Mon Nov 28 2005 Matthias Saou 4.30-1 +* Mon Nov 28 2005 Matthias Saou 4.30-1 - Update to 4.30. -* Thu Oct 27 2005 Matthias Saou 4.29-3 +* Thu Oct 27 2005 Matthias Saou 4.29-3 - Double quote args passed inside the shell scripts, to fix #171480. -* Mon Oct 10 2005 Matthias Saou 4.29-2 +* Mon Oct 10 2005 Matthias Saou 4.29-2 - Update to 4.29. * Sun Jun 05 2005 Dag Wieers - 4.20-1 @@ -205,7 +210,7 @@ find contrib -type f -exec chmod -x {} \; - Moved inline scripts to %%prep stage. - Removed quotes for $@ as it should not be necessary. -* Thu Mar 17 2005 Matthias Saou 4.14.01-1 +* Thu Mar 17 2005 Matthias Saou 4.14.01-1 - Spec file cleanup. - Fix wrapper scripts : Double quote $@ for filenames with spaces to work. - Move files from /usr/share to /usr/libexec. diff --git a/p7zip_9.13-norar.patch b/p7zip_9.13-norar.patch deleted file mode 100644 index d1c1b77..0000000 --- a/p7zip_9.13-norar.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-03-16 20:49:21.000000000 +0100 -+++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile 2010-07-08 14:10:34.309397353 +0200 -@@ -156,14 +156,6 @@ NSIS_OBJS = \ - NsisIn.o \ - NsisRegister.o \ - --RAR_OBJS = \ -- RarHandler.o \ -- RarHeader.o \ -- RarIn.o \ -- RarItem.o \ -- RarVolumeInStream.o \ -- RarRegister.o \ -- - TAR_OBJS = \ - TarHandler.o \ - TarHandlerOut.o \ -@@ -241,13 +233,6 @@ COMPRESS_OBJS = \ - ZlibEncoder.o \ - ZDecoder.o \ - --COMPRESS_OBJS_NON_FREE = \ -- Rar1Decoder.o \ -- Rar2Decoder.o \ -- Rar3Decoder.o \ -- Rar3Vm.o \ -- RarCodecsRegister.o \ -- - CRYPTO_OBJS = \ - 7zAes.o \ - 7zAesRegister.o \ -@@ -255,8 +240,6 @@ CRYPTO_OBJS = \ - MyAes.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- RarAes.o \ - Sha1.o \ - WzAes.o \ - ZipCrypto.o \ -@@ -312,7 +295,6 @@ OBJS = \ - $(HFS_OBJS) \ - $(ISO_OBJS) \ - $(NSIS_OBJS) \ -- $(RAR_OBJS) \ - $(TAR_OBJS) \ - $(UDF_OBJS) \ - $(WIM_OBJS) \ -diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-03-16 20:50:11.000000000 +0100 -+++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-07-08 14:10:34.325397501 +0200 -@@ -131,13 +131,6 @@ SRCS=\ - ../../Archive/Nsis/NsisIn.cpp \ - ../../Archive/Nsis/NsisRegister.cpp \ - \ -- ../../Archive/Rar/RarHandler.cpp \ -- ../../Archive/Rar/RarHeader.cpp \ -- ../../Archive/Rar/RarIn.cpp \ -- ../../Archive/Rar/RarItem.cpp \ -- ../../Archive/Rar/RarVolumeInStream.cpp \ -- ../../Archive/Rar/RarRegister.cpp \ -- \ - ../../Archive/Tar/TarHandler.cpp \ - ../../Archive/Tar/TarHandlerOut.cpp \ - ../../Archive/Tar/TarHeader.cpp \ -@@ -218,8 +211,6 @@ SRCS=\ - ../../Crypto/RandGen.cpp \ - ../../Crypto/Sha1.cpp \ - ../../Crypto/WzAes.cpp \ -- ../../Crypto/Rar20Crypto.cpp \ -- ../../Crypto/RarAes.cpp \ - ../../Crypto/ZipCrypto.cpp \ - ../../Crypto/ZipStrong.cpp - -diff -Naupr --exclude='*.orig' p7zip_9.13.orig/makefile p7zip_9.13/makefile ---- p7zip_9.13.orig/makefile 2010-04-04 21:12:39.000000000 +0200 -+++ p7zip_9.13/makefile 2010-07-08 14:10:34.326397745 +0200 -@@ -52,7 +52,6 @@ depend: - cd CPP/7zip/UI/Client7z ; $(MAKE) depend - cd CPP/7zip/UI/Console ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend -- cd CPP/7zip/Compress/Rar ; $(MAKE) depend - cd CPP/7zip/UI/GUI ; $(MAKE) depend - cd CPP/7zip/UI/FileManager ; $(MAKE) depend - -@@ -63,7 +62,6 @@ sfx: common - common7z:common - $(MKDIR) bin/Codecs - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all -- cd CPP/7zip/Compress/Rar ; $(MAKE) all - - 7z: common7z - cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -88,7 +86,6 @@ clean: - cd CPP/7zip/UI/FileManager ; $(MAKE) clean - cd CPP/7zip/UI/GUI ; $(MAKE) clean - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean -- cd CPP/7zip/Compress/Rar ; $(MAKE) clean - cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean - cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean - cd CPP/7zip/TEST/TestUI ; $(MAKE) clean diff --git a/p7zip_9.13-nostrip.patch b/p7zip_9.13-nostrip.patch deleted file mode 100644 index 93c2585..0000000 --- a/p7zip_9.13-nostrip.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naupr p7zip_9.13.orig/makefile.linux_amd64_asm p7zip_9.13/makefile.linux_amd64_asm ---- p7zip_9.13.orig/makefile.linux_amd64_asm 2009-12-22 19:11:03.000000000 +0100 -+++ p7zip_9.13/makefile.linux_amd64_asm 2010-07-08 14:12:33.197398954 +0200 -@@ -2,7 +2,7 @@ - OPTFLAGS=-O - - # use "-m32" to have a 32bits executable --ALLFLAGS=-m64 ${OPTFLAGS} -pipe -s \ -+ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - -D_7ZIP_LARGE_PAGES \ -diff -Naupr p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X p7zip_9.13/makefile.linux_x86_asm_gcc_4.X ---- p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X 2009-12-22 19:12:54.000000000 +0100 -+++ p7zip_9.13/makefile.linux_x86_asm_gcc_4.X 2010-07-08 14:13:36.185397479 +0200 -@@ -4,7 +4,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -pipe -m32 -s \ -+ALLFLAGS=${OPTFLAGS} -pipe -m32 \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - -D_7ZIP_LARGE_PAGES \ -diff -Naupr p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X ---- p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2009-12-22 19:13:27.000000000 +0100 -+++ p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X 2010-07-08 14:13:49.211397922 +0200 -@@ -4,7 +4,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -pipe -s \ -+ALLFLAGS=${OPTFLAGS} -pipe \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - -D_7ZIP_LARGE_PAGES \ diff --git a/p7zip_4.58-install.patch b/p7zip_9.20.1-install.patch similarity index 54% rename from p7zip_4.58-install.patch rename to p7zip_9.20.1-install.patch index 078cf05..8e63e6d 100644 --- a/p7zip_4.58-install.patch +++ b/p7zip_9.20.1-install.patch @@ -1,66 +1,22 @@ -diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh ---- p7zip_4.58.orig/install.sh 2008-03-02 14:35:05.000000000 +0100 -+++ p7zip_4.58/install.sh 2008-06-18 14:02:45.000000000 +0200 -@@ -54,49 +54,41 @@ then +diff -Naupr p7zip_9.20.1.orig/install.sh p7zip_9.20.1/install.sh +--- p7zip_9.20.1.orig/install.sh 2011-03-16 20:32:56.000000000 +0100 ++++ p7zip_9.20.1/install.sh 2011-07-26 14:07:09.609064252 +0200 +@@ -7,12 +7,10 @@ installShared() then - echo "- installing ${DEST_DIR}${DEST_BIN}/7za" - cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za" -- chmod 777 "${DEST_DIR}${DEST_SHARE}/7za" -- strip "${DEST_DIR}${DEST_SHARE}/7za" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7za" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7za" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za" - echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" + echo "- installing ${DEST_DIR}${DEST_BIN}/${prg}" + cp bin/${prg} "${DEST_DIR}${DEST_SHARE}/${prg}" +- chmod 777 "${DEST_DIR}${DEST_SHARE}/${prg}" +- strip "${DEST_DIR}${DEST_SHARE}/${prg}" +- chmod 555 "${DEST_DIR}${DEST_SHARE}/${prg}" ++ chmod 755 "${DEST_DIR}${DEST_SHARE}/${prg}" + echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/${prg}" + echo "\"${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}" +- chmod 555 "${DEST_DIR}${DEST_BIN}/${prg}" ++ chmod 755 "${DEST_DIR}${DEST_BIN}/${prg}" fi + } - if [ -x bin/7zr ] - then - echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" - cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr" -- chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr" -- strip "${DEST_DIR}${DEST_SHARE}/7zr" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr" - echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" - fi - - if [ -x bin/7zCon.sfx ] - then - echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -- chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -- strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx" - fi - - if [ -x bin/7z ] - then - echo "- installing ${DEST_DIR}${DEST_BIN}/7z" - cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z" -- chmod 777 "${DEST_DIR}${DEST_SHARE}/7z" -- strip "${DEST_DIR}${DEST_SHARE}/7z" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z" - cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/" -- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/* -+ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/* - cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z" - echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7z" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7z" - fi - - else -@@ -105,7 +97,7 @@ else +@@ -117,7 +115,7 @@ else echo "- installing ${DEST_DIR}${DEST_BIN}/7za" mkdir -p "${DEST_DIR}${DEST_BIN}" cp bin/7za "${DEST_DIR}${DEST_BIN}/7za" @@ -69,7 +25,7 @@ diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh fi if [ -x bin/7zr ] -@@ -113,7 +105,7 @@ else +@@ -125,7 +123,7 @@ else echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" mkdir -p "${DEST_DIR}${DEST_BIN}" cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr" @@ -78,7 +34,7 @@ diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh fi fi -@@ -122,27 +114,27 @@ if [ -d DOCS ] +@@ -134,27 +132,27 @@ if [ -d DOCS ] then echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" @@ -112,7 +68,7 @@ diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh fi if [ -f README ] -@@ -150,7 +142,7 @@ then +@@ -162,7 +160,7 @@ then echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" cp README "${DEST_DIR}${DEST_SHARE_DOC}/README" @@ -121,7 +77,7 @@ diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh fi if [ -f ChangeLog ] -@@ -158,7 +150,7 @@ then +@@ -170,7 +168,7 @@ then echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" @@ -130,7 +86,7 @@ diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh fi if [ -d DOCS ] -@@ -166,7 +158,7 @@ then +@@ -178,8 +176,8 @@ then echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" @@ -140,3 +96,4 @@ diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh + find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \; fi + use_lang="n" diff --git a/p7zip_9.20.1-norar.patch b/p7zip_9.20.1-norar.patch new file mode 100644 index 0000000..e78bab5 --- /dev/null +++ b/p7zip_9.20.1-norar.patch @@ -0,0 +1,102 @@ +diff -Naupr p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 16:41:43.000000000 +0100 ++++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2011-07-26 14:11:12.480236487 +0200 +@@ -158,14 +158,6 @@ NSIS_OBJS = \ + NsisIn.o \ + NsisRegister.o \ + +-RAR_OBJS = \ +- RarHandler.o \ +- RarHeader.o \ +- RarIn.o \ +- RarItem.o \ +- RarVolumeInStream.o \ +- RarRegister.o \ +- + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -243,13 +235,6 @@ COMPRESS_OBJS = \ + ZlibEncoder.o \ + ZDecoder.o \ + +-COMPRESS_OBJS_NON_FREE = \ +- Rar1Decoder.o \ +- Rar2Decoder.o \ +- Rar3Decoder.o \ +- Rar3Vm.o \ +- RarCodecsRegister.o \ +- + CRYPTO_OBJS = \ + 7zAes.o \ + 7zAesRegister.o \ +@@ -257,8 +242,6 @@ CRYPTO_OBJS = \ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +@@ -314,7 +297,6 @@ OBJS = \ + $(HFS_OBJS) \ + $(ISO_OBJS) \ + $(NSIS_OBJS) \ +- $(RAR_OBJS) \ + $(TAR_OBJS) \ + $(UDF_OBJS) \ + $(WIM_OBJS) \ +diff -Naupr p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-11-07 16:42:33.000000000 +0100 ++++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile.list 2011-07-26 14:11:31.068174008 +0200 +@@ -133,13 +133,6 @@ SRCS=\ + ../../Archive/Nsis/NsisIn.cpp \ + ../../Archive/Nsis/NsisRegister.cpp \ + \ +- ../../Archive/Rar/RarHandler.cpp \ +- ../../Archive/Rar/RarHeader.cpp \ +- ../../Archive/Rar/RarIn.cpp \ +- ../../Archive/Rar/RarItem.cpp \ +- ../../Archive/Rar/RarVolumeInStream.cpp \ +- ../../Archive/Rar/RarRegister.cpp \ +- \ + ../../Archive/Tar/TarHandler.cpp \ + ../../Archive/Tar/TarHandlerOut.cpp \ + ../../Archive/Tar/TarHeader.cpp \ +@@ -220,8 +213,6 @@ SRCS=\ + ../../Crypto/RandGen.cpp \ + ../../Crypto/Sha1.cpp \ + ../../Crypto/WzAes.cpp \ +- ../../Crypto/Rar20Crypto.cpp \ +- ../../Crypto/RarAes.cpp \ + ../../Crypto/ZipCrypto.cpp \ + ../../Crypto/ZipStrong.cpp + +diff -Naupr p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile +--- p7zip_9.20.1.orig/makefile 2011-03-13 12:52:45.000000000 +0100 ++++ p7zip_9.20.1/makefile 2011-07-26 14:11:43.546132132 +0200 +@@ -56,7 +56,6 @@ depend: + $(MAKE) -C CPP/7zip/UI/Client7z depend + $(MAKE) -C CPP/7zip/UI/Console depend + $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend +- $(MAKE) -C CPP/7zip/Compress/Rar depend + $(MAKE) -C CPP/7zip/UI/GUI depend + $(MAKE) -C CPP/7zip/UI/FileManager depend + $(MAKE) -C check/my_86_filter depend +@@ -68,7 +67,6 @@ sfx: common + common7z:common + $(MKDIR) bin/Codecs + $(MAKE) -C CPP/7zip/Bundles/Format7zFree all +- $(MAKE) -C CPP/7zip/Compress/Rar all + + 7z: common7z + $(MAKE) -C CPP/7zip/UI/Console all +@@ -93,7 +91,6 @@ clean: + $(MAKE) -C CPP/7zip/UI/FileManager clean + $(MAKE) -C CPP/7zip/UI/GUI clean + $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean +- $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean + $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean + $(MAKE) -C CPP/7zip/TEST/TestUI clean diff --git a/p7zip_9.20.1-nostrip.patch b/p7zip_9.20.1-nostrip.patch new file mode 100644 index 0000000..9435126 --- /dev/null +++ b/p7zip_9.20.1-nostrip.patch @@ -0,0 +1,24 @@ +diff -Naupr p7zip_9.20.1.orig/makefile.linux_amd64_asm p7zip_9.20.1/makefile.linux_amd64_asm +--- p7zip_9.20.1.orig/makefile.linux_amd64_asm 2009-12-22 19:11:03.000000000 +0100 ++++ p7zip_9.20.1/makefile.linux_amd64_asm 2011-07-26 14:43:58.275086735 +0200 +@@ -2,7 +2,7 @@ + OPTFLAGS=-O + + # use "-m32" to have a 32bits executable +-ALLFLAGS=-m64 ${OPTFLAGS} -pipe -s \ ++ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.20.1.orig/makefile.linux_x86_asm_gcc_4.X p7zip_9.20.1/makefile.linux_x86_asm_gcc_4.X +--- p7zip_9.20.1.orig/makefile.linux_x86_asm_gcc_4.X 2011-01-11 21:57:50.000000000 +0100 ++++ p7zip_9.20.1/makefile.linux_x86_asm_gcc_4.X 2011-07-26 14:44:14.945027628 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -m32 -s \ ++ALLFLAGS=${OPTFLAGS} -pipe -m32 \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ diff --git a/sources b/sources index 3fbc309..bcd6e8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5790ee20098763841ff87fefefb0ff3 p7zip_9.13_src_all-norar.tar.bz2 +0fb779e1b1fdc6828f4aed9f7fd3f7d6 p7zip_9.20.1_src_all-norar.tar.bz2 From 1cadb4f25599b9b96fdbb24e0aca890ae8f01a01 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 26 Jul 2011 17:46:45 +0200 Subject: [PATCH 37/86] Execstack patch to fix yasm code --- p7zip.spec | 7 ++++++- p7zip_9.20.1-execstack.patch | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 p7zip_9.20.1-execstack.patch diff --git a/p7zip.spec b/p7zip.spec index 5671b2e..57be1d6 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -18,6 +18,7 @@ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_9.20.1-norar.patch Patch1: p7zip_9.20.1-install.patch Patch2: p7zip_9.20.1-nostrip.patch +Patch3: p7zip_9.20.1-execstack.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch %{ix86} BuildRequires: nasm @@ -45,6 +46,7 @@ This package contains also a virtual file system for Midnight Commander. %patch0 -p1 -b .norar %patch1 -p1 -b .install %patch2 -p1 -b .nostrip +%patch3 -p1 -b .execstack # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOCS docs @@ -109,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 26 2011 Matthias Saou 9.20.1-2 +- Execstack patch to fix what's wanted by the yasm code (#718778). + * Tue Jul 26 2011 Matthias Saou 9.20.1-1 - Update to 9.20.1 (#688564). - Update norar, nostrip and install patches. diff --git a/p7zip_9.20.1-execstack.patch b/p7zip_9.20.1-execstack.patch new file mode 100644 index 0000000..1fdff48 --- /dev/null +++ b/p7zip_9.20.1-execstack.patch @@ -0,0 +1,24 @@ +diff -Naupr p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm p7zip_9.20.1/Asm/x64/7zCrcT8U.asm +--- p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm 2008-08-14 11:18:07.000000000 +0200 ++++ p7zip_9.20.1/Asm/x64/7zCrcT8U.asm 2011-07-26 17:43:57.727910278 +0200 +@@ -101,3 +101,8 @@ _CrcUpdateT8: + ret + + end ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++ +diff -Naupr p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm p7zip_9.20.1/Asm/x86/7zCrcT8U.asm +--- p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm 2009-07-14 12:44:15.000000000 +0200 ++++ p7zip_9.20.1/Asm/x86/7zCrcT8U.asm 2011-07-26 17:44:23.938864508 +0200 +@@ -99,3 +99,8 @@ _CrcUpdateT8: + + + ; end ++ ++%ifidn __OUTPUT_FORMAT__,elf ++section .note.GNU-stack noalloc noexec nowrite progbits ++%endif ++ From 87dc925a2b9b1875e9e5b3250632e518b5422fb5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 05:52:10 -0600 Subject: [PATCH 38/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 57be1d6..ea5ebcd 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 2%{?dist} +Release: 3%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 9.20.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Jul 26 2011 Matthias Saou 9.20.1-2 - Execstack patch to fix what's wanted by the yasm code (#718778). From 34cf6b359af7a299fb02482b9a2dd4f7558bcf33 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 02:40:58 -0500 Subject: [PATCH 39/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index ea5ebcd..f2d41b9 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 3%{?dist} +Release: 4%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 9.20.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 9.20.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From f3e62149e986209ccc9ff80df8cbec136ace8923 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 03:40:56 -0600 Subject: [PATCH 40/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index f2d41b9..0d44cea 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 4%{?dist} +Release: 5%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 9.20.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 20 2012 Fedora Release Engineering - 9.20.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 3b4b23b35a76e11b442dac06692912305b1e5437 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 11:16:28 -0500 Subject: [PATCH 41/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 0d44cea..eaec042 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 5%{?dist} +Release: 6%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 9.20.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 9.20.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 95794e124f948cf5d905b3f08a6ab47e07a161ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:23:28 -0500 Subject: [PATCH 42/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index eaec042..cd2e4bb 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 6%{?dist} +Release: 7%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 9.20.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 9.20.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 217fc4270c5adfac8d074718f96dd489962cc490 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 14:30:04 +0000 Subject: [PATCH 43/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index cd2e4bb..c7360d8 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 7%{?dist} +Release: 8%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 9.20.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 9.20.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 1bbdb4b143d1c4b65be8cf07fbbc4901bd75bb9d Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 16:32:14 +0200 Subject: [PATCH 44/86] Rebuilt for GCC 5 C++11 ABI change --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index c7360d8..9ba4f80 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 8%{?dist} +Release: 9%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Sat May 02 2015 Kalev Lember - 9.20.1-9 +- Rebuilt for GCC 5 C++11 ABI change + * Sun Aug 17 2014 Fedora Release Engineering - 9.20.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 960b9fb0438f459db96340bdb779eb7bc3c022e7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 00:34:25 +0000 Subject: [PATCH 45/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 9ba4f80..263a147 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 9.20.1 -Release: 9%{?dist} +Release: 10%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -111,6 +111,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 9.20.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 9.20.1-9 - Rebuilt for GCC 5 C++11 ABI change From 6fd89d9572110986f2edd95e409d13e22a025cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 5 Nov 2015 15:53:09 +0000 Subject: [PATCH 46/86] Update to p7zip_15.09 - Use cmake. - Refactor norar patch. - Deleted: p7zip_9.20.1-execstack.patch (upstreamed) - Deleted: p7zip_9.20.1-install.patch (upstreamed) - Deleted: p7zip_9.20.1-nostrip.patch (upstreamed) --- .gitignore | 1 + p7zip.spec | 40 ++++----- p7zip_15.09-norar_cmake.patch | 148 ++++++++++++++++++++++++++++++++++ p7zip_9.20.1-execstack.patch | 24 ------ p7zip_9.20.1-install.patch | 99 ----------------------- p7zip_9.20.1-nostrip.patch | 24 ------ sources | 2 +- 7 files changed, 170 insertions(+), 168 deletions(-) create mode 100644 p7zip_15.09-norar_cmake.patch delete mode 100644 p7zip_9.20.1-execstack.patch delete mode 100644 p7zip_9.20.1-install.patch delete mode 100644 p7zip_9.20.1-nostrip.patch diff --git a/.gitignore b/.gitignore index 570927e..a70d0d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /p7zip_9.13_src_all-norar.tar.bz2 /p7zip_9.20.1_src_all-norar.tar.bz2 +/p7zip_15.09_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 263a147..1c2a114 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 9.20.1 -Release: 10%{?dist} +Version: 15.09 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -12,14 +12,13 @@ URL: http://p7zip.sourceforge.net/ # wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 # rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar* -# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt +# rm p7zip_${VERSION}/DOC/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_9.20.1-norar.patch -Patch1: p7zip_9.20.1-install.patch -Patch2: p7zip_9.20.1-nostrip.patch -Patch3: p7zip_9.20.1-execstack.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +Patch0: p7zip_15.09-norar_cmake.patch + +BuildRequires: cmake +# BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI %ifarch %{ix86} BuildRequires: nasm %endif @@ -43,13 +42,10 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -q -n %{name}_%{version} -%patch0 -p1 -b .norar -%patch1 -p1 -b .install -%patch2 -p1 -b .nostrip -%patch3 -p1 -b .execstack +%patch0 -p1 -b .norar_cmake # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc -mv DOCS docs +mv DOC docs mv ChangeLog README TODO docs/ # And fix useless executable bit while we're at it find docs -type f -exec chmod -x {} \; @@ -57,6 +53,9 @@ find contrib -type f -exec chmod -x {} \; %build +pushd CPP/7zip/CMAKE/ +./generate.sh +popd %ifarch %{ix86} cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine %endif @@ -76,7 +75,6 @@ make %{?_smp_mflags} all2 \ %install -rm -rf %{buildroot} make install \ DEST_DIR=%{buildroot} \ DEST_HOME=%{_prefix} \ @@ -85,12 +83,7 @@ make install \ DEST_MAN=%{_mandir} -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc docs/* %{_bindir}/7za %dir %{_libexecdir}/p7zip/ @@ -100,7 +93,6 @@ rm -rf %{buildroot} %exclude %{_mandir}/man1/7zr.1* %files plugins -%defattr(-,root,root,-) %doc contrib/ %{_bindir}/7z %{_libexecdir}/p7zip/7z @@ -111,6 +103,14 @@ rm -rf %{buildroot} %changelog +* Thu Nov 05 2015 SĂŠrgio Basto - 15.09-1 +- Update to p7zip_15.09 +- Use cmake. +- Refactor norar patch. +- Deleted: p7zip_9.20.1-execstack.patch (upstreamed) +- Deleted: p7zip_9.20.1-install.patch (upstreamed) +- Deleted: p7zip_9.20.1-nostrip.patch (upstreamed) + * Thu Jun 18 2015 Fedora Release Engineering - 9.20.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.09-norar_cmake.patch new file mode 100644 index 0000000..f9c7540 --- /dev/null +++ b/p7zip_15.09-norar_cmake.patch @@ -0,0 +1,148 @@ +diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.09/CPP/7zip/CMAKE/generate.sh +--- p7zip_15.09.orig/CPP/7zip/CMAKE/generate.sh 2015-01-18 17:14:54.000000000 +0000 ++++ p7zip_15.09/CPP/7zip/CMAKE/generate.sh 2015-11-05 03:55:11.789432894 +0000 +@@ -15,14 +15,14 @@ CURDIR=$PWD + cd $CURDIR + doit "Unix" "Unix Makefiles" + +-cd $CURDIR +-doit "codeblocks" "CodeBlocks - Unix Makefiles" ++#cd $CURDIR ++#doit "codeblocks" "CodeBlocks - Unix Makefiles" + + #cd $CURDIR + #doit "KDevelop3" "KDevelop3" + +-cd $CURDIR +-doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" ++#cd $CURDIR ++#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" + + #cd $CURDIR + #doit "ninja" "Ninja" +diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.09/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt +--- p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-10-10 13:30:03.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-11-05 04:21:50.386888680 +0000 +@@ -127,8 +127,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Archive/PeHandler.cpp" + "../../../../CPP/7zip/Archive/PpmdHandler.cpp" + "../../../../CPP/7zip/Archive/QcowHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" + "../../../../CPP/7zip/Archive/RpmHandler.cpp" + "../../../../CPP/7zip/Archive/SplitHandler.cpp" + "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" +@@ -231,9 +229,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Crypto/MyAesReg.cpp" + "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" + "../../../../CPP/7zip/Crypto/RandGen.cpp" +- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" +- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" +- "../../../../CPP/7zip/Crypto/RarAes.cpp" + "../../../../CPP/7zip/Crypto/WzAes.cpp" + "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" + "../../../../CPP/7zip/Crypto/ZipStrong.cpp" +--- p7zip_15.09.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-10-10 13:30:03.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-11-05 13:22:50.715659911 +0000 +@@ -89,8 +89,6 @@ SRCS=\ + ../../../../CPP/7zip/Archive/PeHandler.cpp \ + ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ + ../../../../CPP/7zip/Archive/QcowHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ +- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ + ../../../../CPP/7zip/Archive/RpmHandler.cpp \ + ../../../../CPP/7zip/Archive/SplitHandler.cpp \ + ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ +@@ -193,9 +191,6 @@ SRCS=\ + ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ + ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ + ../../../../CPP/7zip/Crypto/RandGen.cpp \ +- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ +- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ +- ../../../../CPP/7zip/Crypto/RarAes.cpp \ + ../../../../CPP/7zip/Crypto/WzAes.cpp \ + ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ + ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ +@@ -491,10 +486,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp + QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp +-RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp +-Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp + RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp + SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp +@@ -699,12 +690,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/ + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp + RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp +-Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp +-Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp +-RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp +- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp + WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp + $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp + ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp +@@ -877,8 +862,6 @@ OBJS=\ + PeHandler.o \ + PpmdHandler.o \ + QcowHandler.o \ +- RarHandler.o \ +- Rar5Handler.o \ + RpmHandler.o \ + SplitHandler.o \ + SquashfsHandler.o \ +@@ -981,9 +964,6 @@ OBJS=\ + MyAesReg.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- Rar5Aes.o \ +- RarAes.o \ + WzAes.o \ + ZipCrypto.o \ + ZipStrong.o \ +--- p7zip_15.09.orig/makefile 2015-10-05 09:39:57.000000000 +0100 ++++ p7zip_15.09/makefile 2015-11-05 13:36:01.160793573 +0000 +@@ -70,7 +70,6 @@ depend: + $(MAKE) -C CPP/7zip/UI/Client7z depend + $(MAKE) -C CPP/7zip/UI/Console depend + $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend +- $(MAKE) -C CPP/7zip/Compress/Rar depend + $(MAKE) -C CPP/7zip/UI/GUI depend + $(MAKE) -C CPP/7zip/UI/FileManager depend + +@@ -81,7 +80,6 @@ sfx: common + common7z:common + $(MKDIR) bin/Codecs + $(MAKE) -C CPP/7zip/Bundles/Format7zFree all +- $(MAKE) -C CPP/7zip/Compress/Rar all + + 7z: common7z + $(MAKE) -C CPP/7zip/UI/Console all +@@ -106,7 +104,6 @@ clean: + $(MAKE) -C CPP/7zip/UI/FileManager clean + $(MAKE) -C CPP/7zip/UI/GUI clean + $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean +- $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 + $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean + $(MAKE) -C CPP/7zip/TEST/TestUI clean +--- p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt 2015-06-21 20:53:26.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt 2015-11-05 14:35:42.849613481 +0000 +@@ -27,9 +27,9 @@ add_subdirectory(7za) + + add_subdirectory(7z_) + +-add_subdirectory(7zG) ++#add_subdirectory(7zG) + +-add_subdirectory(7zFM) ++#add_subdirectory(7zFM) + + add_subdirectory(7zr) + diff --git a/p7zip_9.20.1-execstack.patch b/p7zip_9.20.1-execstack.patch deleted file mode 100644 index 1fdff48..0000000 --- a/p7zip_9.20.1-execstack.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm p7zip_9.20.1/Asm/x64/7zCrcT8U.asm ---- p7zip_9.20.1.orig/Asm/x64/7zCrcT8U.asm 2008-08-14 11:18:07.000000000 +0200 -+++ p7zip_9.20.1/Asm/x64/7zCrcT8U.asm 2011-07-26 17:43:57.727910278 +0200 -@@ -101,3 +101,8 @@ _CrcUpdateT8: - ret - - end -+ -+%ifidn __OUTPUT_FORMAT__,elf -+section .note.GNU-stack noalloc noexec nowrite progbits -+%endif -+ -diff -Naupr p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm p7zip_9.20.1/Asm/x86/7zCrcT8U.asm ---- p7zip_9.20.1.orig/Asm/x86/7zCrcT8U.asm 2009-07-14 12:44:15.000000000 +0200 -+++ p7zip_9.20.1/Asm/x86/7zCrcT8U.asm 2011-07-26 17:44:23.938864508 +0200 -@@ -99,3 +99,8 @@ _CrcUpdateT8: - - - ; end -+ -+%ifidn __OUTPUT_FORMAT__,elf -+section .note.GNU-stack noalloc noexec nowrite progbits -+%endif -+ diff --git a/p7zip_9.20.1-install.patch b/p7zip_9.20.1-install.patch deleted file mode 100644 index 8e63e6d..0000000 --- a/p7zip_9.20.1-install.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -Naupr p7zip_9.20.1.orig/install.sh p7zip_9.20.1/install.sh ---- p7zip_9.20.1.orig/install.sh 2011-03-16 20:32:56.000000000 +0100 -+++ p7zip_9.20.1/install.sh 2011-07-26 14:07:09.609064252 +0200 -@@ -7,12 +7,10 @@ installShared() - then - echo "- installing ${DEST_DIR}${DEST_BIN}/${prg}" - cp bin/${prg} "${DEST_DIR}${DEST_SHARE}/${prg}" -- chmod 777 "${DEST_DIR}${DEST_SHARE}/${prg}" -- strip "${DEST_DIR}${DEST_SHARE}/${prg}" -- chmod 555 "${DEST_DIR}${DEST_SHARE}/${prg}" -+ chmod 755 "${DEST_DIR}${DEST_SHARE}/${prg}" - echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/${prg}" - echo "\"${DEST_SHARE}/${prg}\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/${prg}" -- chmod 555 "${DEST_DIR}${DEST_BIN}/${prg}" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/${prg}" - fi - } - -@@ -117,7 +115,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7za" - mkdir -p "${DEST_DIR}${DEST_BIN}" - cp bin/7za "${DEST_DIR}${DEST_BIN}/7za" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7za" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za" - fi - - if [ -x bin/7zr ] -@@ -125,7 +123,7 @@ else - echo "- installing ${DEST_DIR}${DEST_BIN}/7zr" - mkdir -p "${DEST_DIR}${DEST_BIN}" - cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr" -- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr" -+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr" - fi - fi - -@@ -134,27 +132,27 @@ if [ -d DOCS ] - then - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" - else - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1" - grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1" - grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1" - - echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1" - grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" -+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1" - fi - - if [ -f README ] -@@ -162,7 +160,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp README "${DEST_DIR}${DEST_SHARE_DOC}/README" -- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README" -+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README" - fi - - if [ -f ChangeLog ] -@@ -170,7 +168,7 @@ then - echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" -- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" -+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog" - fi - - if [ -d DOCS ] -@@ -178,8 +176,8 @@ then - echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS" - mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}" - cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \; -- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \; -+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \; -+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \; - fi - - use_lang="n" diff --git a/p7zip_9.20.1-nostrip.patch b/p7zip_9.20.1-nostrip.patch deleted file mode 100644 index 9435126..0000000 --- a/p7zip_9.20.1-nostrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr p7zip_9.20.1.orig/makefile.linux_amd64_asm p7zip_9.20.1/makefile.linux_amd64_asm ---- p7zip_9.20.1.orig/makefile.linux_amd64_asm 2009-12-22 19:11:03.000000000 +0100 -+++ p7zip_9.20.1/makefile.linux_amd64_asm 2011-07-26 14:43:58.275086735 +0200 -@@ -2,7 +2,7 @@ - OPTFLAGS=-O - - # use "-m32" to have a 32bits executable --ALLFLAGS=-m64 ${OPTFLAGS} -pipe -s \ -+ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - -D_7ZIP_LARGE_PAGES \ -diff -Naupr p7zip_9.20.1.orig/makefile.linux_x86_asm_gcc_4.X p7zip_9.20.1/makefile.linux_x86_asm_gcc_4.X ---- p7zip_9.20.1.orig/makefile.linux_x86_asm_gcc_4.X 2011-01-11 21:57:50.000000000 +0100 -+++ p7zip_9.20.1/makefile.linux_x86_asm_gcc_4.X 2011-07-26 14:44:14.945027628 +0200 -@@ -4,7 +4,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -pipe -m32 -s \ -+ALLFLAGS=${OPTFLAGS} -pipe -m32 \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - -D_7ZIP_LARGE_PAGES \ diff --git a/sources b/sources index bcd6e8a..25b0a88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0fb779e1b1fdc6828f4aed9f7fd3f7d6 p7zip_9.20.1_src_all-norar.tar.bz2 +51b361979baf8124935cfaa2888b4a10 p7zip_15.09_src_all-norar.tar.bz2 From 1984e15f454155a692b46a0b7b5aa8f820eba195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 13 Nov 2015 00:01:55 +0000 Subject: [PATCH 47/86] fix rhbz #917366 --- p7zip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 1c2a114..a33ebb1 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -95,6 +95,7 @@ make install \ %files plugins %doc contrib/ %{_bindir}/7z +%dir %{_libexecdir}/p7zip/ %{_libexecdir}/p7zip/7z %{_libexecdir}/p7zip/7z.so #{_libexecdir}/p7zip/Codecs/ @@ -103,6 +104,9 @@ make install \ %changelog +* Thu Nov 12 2015 SĂŠrgio Basto - 15.09-2 +- fix rhbz #917366 + * Thu Nov 05 2015 SĂŠrgio Basto - 15.09-1 - Update to p7zip_15.09 - Use cmake. From 9218896c9eba9d242e5b5307e97280eff91da3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 2 Dec 2015 22:43:22 +0000 Subject: [PATCH 48/86] Fix build on s390 architecture (#1286992) --- p7zip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index a33ebb1..7edff1a 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 2%{?dist} +Release: 3%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -16,6 +16,7 @@ URL: http://p7zip.sourceforge.net/ # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.09-norar_cmake.patch +Patch1: p7zip_15.09-s390.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -43,6 +44,7 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -q -n %{name}_%{version} %patch0 -p1 -b .norar_cmake +%patch1 -p1 -b .s390 # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -104,6 +106,9 @@ make install \ %changelog +* Wed Dec 02 2015 SĂŠrgio Basto - 15.09-3 +- Fix build on s390 architecture (#1286992) + * Thu Nov 12 2015 SĂŠrgio Basto - 15.09-2 - fix rhbz #917366 From c34dd485391960833540b0cc605398458531f37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 2 Dec 2015 23:16:40 +0000 Subject: [PATCH 49/86] Forgot git add p7zip_15.09-s390.patch --- p7zip_15.09-s390.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 p7zip_15.09-s390.patch diff --git a/p7zip_15.09-s390.patch b/p7zip_15.09-s390.patch new file mode 100644 index 0000000..5ae3af2 --- /dev/null +++ b/p7zip_15.09-s390.patch @@ -0,0 +1,11 @@ +--- p7zip_15.09.orig/C/CpuArch.h 2015-09-27 15:31:20.000000000 -0400 ++++ p7zip_15.09/C/CpuArch.h 2015-12-01 06:16:38.000000000 -0500 +@@ -77,7 +77,7 @@ + || defined(__MIPSEB) \ + || defined(_MIPSEB) \ + || defined(__m68k__) \ +- || defined(__s390x__) ++ || defined(__s390__) + #define MY_CPU_BE + #endif + From f3d8f17097e834fedd4f21a48123406a95af26a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 3 Dec 2015 02:35:02 +0000 Subject: [PATCH 50/86] Fix CVE-2015-1038 (#1179505) --- p7zip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 7edff1a..c4a0887 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 3%{?dist} +Release: 4%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -17,6 +17,7 @@ URL: http://p7zip.sourceforge.net/ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.09-norar_cmake.patch Patch1: p7zip_15.09-s390.patch +Patch2: p7zip-15.09-CVE-2015-1038.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -45,6 +46,7 @@ This package contains also a virtual file system for Midnight Commander. %setup -q -n %{name}_%{version} %patch0 -p1 -b .norar_cmake %patch1 -p1 -b .s390 +%patch2 -p1 -b .CVE-2015-1038 # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -106,6 +108,9 @@ make install \ %changelog +* Thu Dec 03 2015 SĂŠrgio Basto - 15.09-4 +- Fix CVE-2015-1038 (#1179505) + * Wed Dec 02 2015 SĂŠrgio Basto - 15.09-3 - Fix build on s390 architecture (#1286992) From 212716b55d1e1062c029d5b05da2a467d39da18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 3 Dec 2015 02:47:51 +0000 Subject: [PATCH 51/86] git add p7zip-9.38.1-CVE-2015-1038.patch --- p7zip-9.38.1-CVE-2015-1038.patch | 283 +++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) create mode 100644 p7zip-9.38.1-CVE-2015-1038.patch diff --git a/p7zip-9.38.1-CVE-2015-1038.patch b/p7zip-9.38.1-CVE-2015-1038.patch new file mode 100644 index 0000000..c4e4436 --- /dev/null +++ b/p7zip-9.38.1-CVE-2015-1038.patch @@ -0,0 +1,283 @@ +Author: Ben Hutchings +Date: Tue, 19 May 2015 02:38:40 +0100 +Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038) +Bug: http://sourceforge.net/p/p7zip/bugs/147/ +Bug-Debian: https://bugs.debian.org/774660 + +Alexander Cherepanov discovered that 7zip is susceptible to a +directory traversal vulnerability. While extracting an archive, it +will extract symlinks and then follow them if they are referenced in +further entries. This can be exploited by a rogue archive to write +files outside the current directory. + +We have to create placeholder files (which we already do) and delay +creating symlinks until the end of extraction. + +Due to the possibility of anti-items (deletions) in the archive, it is +possible for placeholders to be deleted and replaced before we create +the symlinks. It's not clear that this can be used for mischief, but +GNU tar guards against similar problems by checking that the placeholder +still exists and is the same inode. XXX It also checks 'birth time' but +this isn't portable. We can probably get away with comparing ctime +since we don't support hard links. + +--- a/CPP/7zip/UI/Agent/Agent.cpp ++++ b/CPP/7zip/UI/Agent/Agent.cpp +@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const + HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(), + realIndices.Size(), testMode, extractCallback); + if (result == S_OK) +- result = extractCallbackSpec->SetDirsTimes(); ++ result = extractCallbackSpec->SetFinalAttribs(); + return result; + COM_TRY_END + } +--- a/CPP/7zip/UI/Client7z/Client7z.cpp ++++ b/CPP/7zip/UI/Client7z/Client7z.cpp +@@ -222,8 +222,11 @@ private: + COutFileStream *_outFileStreamSpec; + CMyComPtr _outFileStream; + ++ CObjectVector _delayedSymLinks; ++ + public: + void Init(IInArchive *archiveHandler, const FString &directoryPath); ++ HRESULT SetFinalAttribs(); + + UInt64 NumErrors; + bool PasswordIsDefined; +@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se + } + _outFileStream.Release(); + if (_extractMode && _processedFileInfo.AttribDefined) +- SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib); ++ SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks); + PrintNewLine(); + return S_OK; + } + ++HRESULT CArchiveExtractCallback::SetFinalAttribs() ++{ ++ HRESULT result = S_OK; ++ ++ for (int i = 0; i != _delayedSymLinks.Size(); ++i) ++ if (!_delayedSymLinks[i].Create()) ++ result = E_FAIL; ++ ++ _delayedSymLinks.Clear(); ++ ++ return result; ++} + + STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password) + { +@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha + // extractCallbackSpec->PasswordIsDefined = true; + // extractCallbackSpec->Password = L"1"; + HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback); ++ if (result == S_OK) ++ result = extractCallbackSpec->SetFinalAttribs(); + if (result != S_OK) + { + PrintError("Extract Error"); +--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp ++++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se + NumFiles++; + + if (_extractMode && _fi.AttribDefined) +- SetFileAttrib(_diskFilePath, _fi.Attrib); ++ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); + RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted)); + return S_OK; + COM_TRY_END +@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s) + } + } + +-HRESULT CArchiveExtractCallback::SetDirsTimes() ++HRESULT CArchiveExtractCallback::SetFinalAttribs() + { ++ HRESULT result = S_OK; + CRecordVector pairs; + pairs.ClearAndSetSize(_extractedFolderPaths.Size()); + unsigned i; +@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs + (WriteATime && ATimeDefined) ? &ATime : NULL, + (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL)); + } +- return S_OK; ++ ++ for (int i = 0; i != _delayedSymLinks.Size(); ++i) ++ if (!_delayedSymLinks[i].Create()) ++ result = E_FAIL; ++ ++ _delayedSymLinks.Clear(); ++ ++ return result; + } +--- a/CPP/7zip/UI/Common/ArchiveExtractCallback.h ++++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.h +@@ -6,6 +6,8 @@ + #include "../../../Common/MyCom.h" + #include "../../../Common/Wildcard.h" + ++#include "../../../Windows/FileDir.h" ++ + #include "../../IPassword.h" + + #include "../../Common/FileStreams.h" +@@ -213,6 +215,8 @@ class CArchiveExtractCallback: + bool _saclEnabled; + #endif + ++ CObjectVector _delayedSymLinks; ++ + void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); + HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); + HRESULT GetUnpackSize(); +@@ -293,7 +297,7 @@ public: + _baseParentFolder = indexInArc; + } + +- HRESULT SetDirsTimes(); ++ HRESULT SetFinalAttribs(); + }; + + #endif +--- a/CPP/7zip/UI/Common/Extract.cpp ++++ b/CPP/7zip/UI/Common/Extract.cpp +@@ -170,7 +170,7 @@ static HRESULT DecompressArchive( + else + result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs); + if (result == S_OK && !options.StdInMode) +- result = ecs->SetDirsTimes(); ++ result = ecs->SetFinalAttribs(); + return callback->ExtractResult(result); + } + +--- a/CPP/Windows/FileDir.cpp ++++ b/CPP/Windows/FileDir.cpp +@@ -343,7 +343,8 @@ static int convert_to_symlink(const char + return -1; + } + +-bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes) ++bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes, ++ CObjectVector *delayedSymLinks) + { + if (!fileName) { + SetLastError(ERROR_PATH_NOT_FOUND); +@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD + stat_info.st_mode = fileAttributes >> 16; + #ifdef ENV_HAVE_LSTAT + if (S_ISLNK(stat_info.st_mode)) { +- if ( convert_to_symlink(name) != 0) { ++ if (delayedSymLinks) ++ delayedSymLinks->Add(CDelayedSymLink(name)); ++ else if ( convert_to_symlink(name) != 0) { + TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes))) + return false; + } +@@ -885,6 +888,43 @@ bool CTempDir::Remove() + return !_mustBeDeleted; + } + ++#ifdef ENV_UNIX ++ ++CDelayedSymLink::CDelayedSymLink(const char * source) ++ : _source(source) ++{ ++ struct stat st; ++ ++ if (lstat(_source, &st) == 0) { ++ _dev = st.st_dev; ++ _ino = st.st_ino; ++ } else { ++ _dev = 0; ++ } ++} ++ ++bool CDelayedSymLink::Create() ++{ ++ struct stat st; ++ ++ if (_dev == 0) { ++ errno = EPERM; ++ return false; ++ } ++ if (lstat(_source, &st) != 0) ++ return false; ++ if (_dev != st.st_dev || _ino != st.st_ino) { ++ // Placeholder file has been overwritten or moved by another ++ // symbolic link creation ++ errno = EPERM; ++ return false; ++ } ++ ++ return convert_to_symlink(_source) == 0; ++} ++ ++#endif // ENV_UNIX ++ + }}} + + +--- a/CPP/Windows/FileDir.h ++++ b/CPP/Windows/FileDir.h +@@ -4,6 +4,7 @@ + #define __WINDOWS_FILE_DIR_H + + #include "../Common/MyString.h" ++#include "../Common/MyVector.h" + + #include "FileIO.h" + +@@ -11,11 +12,14 @@ namespace NWindows { + namespace NFile { + namespace NDir { + ++class CDelayedSymLink; ++ + bool GetWindowsDir(FString &path); + bool GetSystemDir(FString &path); + + bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime); +-bool SetFileAttrib(CFSTR path, DWORD attrib); ++bool SetFileAttrib(CFSTR path, DWORD attrib, ++ CObjectVector *delayedSymLinks = 0); + bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); + + #ifndef UNDER_CE +@@ -69,6 +73,31 @@ public: + bool Remove(); + }; + ++// Symbolic links must be created last so that they can't be used to ++// create or overwrite files above the extraction directory. ++class CDelayedSymLink ++{ ++#ifdef ENV_UNIX ++ // Where the symlink should be created. The target is specified in ++ // the placeholder file. ++ AString _source; ++ ++ // Device and inode of the placeholder file. Before creating the ++ // symlink, we must check that these haven't been changed by creation ++ // of another symlink. ++ dev_t _dev; ++ ino_t _ino; ++ ++public: ++ explicit CDelayedSymLink(const char * source); ++ bool Create(); ++#else // !ENV_UNIX ++public: ++ CDelayedSymLink(const char * source) {} ++ bool Create() { return true; } ++#endif // ENV_UNIX ++}; ++ + #if !defined(UNDER_CE) + class CCurrentDirRestorer + { From 578cf139e9ec7d1dbfbccb44e48acec255ae833f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 3 Dec 2015 02:52:22 +0000 Subject: [PATCH 52/86] Added the correct p7zip-15.09-CVE-2015-1038.patch --- ...8.patch => p7zip-15.09-CVE-2015-1038.patch | 77 ++++++++++--------- 1 file changed, 42 insertions(+), 35 deletions(-) rename p7zip-9.38.1-CVE-2015-1038.patch => p7zip-15.09-CVE-2015-1038.patch (70%) diff --git a/p7zip-9.38.1-CVE-2015-1038.patch b/p7zip-15.09-CVE-2015-1038.patch similarity index 70% rename from p7zip-9.38.1-CVE-2015-1038.patch rename to p7zip-15.09-CVE-2015-1038.patch index c4e4436..5da28c5 100644 --- a/p7zip-9.38.1-CVE-2015-1038.patch +++ b/p7zip-15.09-CVE-2015-1038.patch @@ -21,9 +21,10 @@ still exists and is the same inode. XXX It also checks 'birth time' but this isn't portable. We can probably get away with comparing ctime since we don't support hard links. ---- a/CPP/7zip/UI/Agent/Agent.cpp -+++ b/CPP/7zip/UI/Agent/Agent.cpp -@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const +diff -rup p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp +--- p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp 2015-09-17 20:02:35.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp 2015-12-03 02:22:47.073724194 +0000 +@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(), realIndices.Size(), testMode, extractCallback); if (result == S_OK) @@ -32,9 +33,10 @@ since we don't support hard links. return result; COM_TRY_END } ---- a/CPP/7zip/UI/Client7z/Client7z.cpp -+++ b/CPP/7zip/UI/Client7z/Client7z.cpp -@@ -222,8 +222,11 @@ private: +diff -rup p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp +--- p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp 2015-10-17 15:52:30.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp 2015-12-03 02:22:47.073724194 +0000 +@@ -230,8 +230,11 @@ private: COutFileStream *_outFileStreamSpec; CMyComPtr _outFileStream; @@ -46,7 +48,7 @@ since we don't support hard links. UInt64 NumErrors; bool PasswordIsDefined; -@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se +@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se } _outFileStream.Release(); if (_extractMode && _processedFileInfo.AttribDefined) @@ -71,7 +73,7 @@ since we don't support hard links. STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password) { -@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha +@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha // extractCallbackSpec->PasswordIsDefined = true; // extractCallbackSpec->Password = L"1"; HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback); @@ -80,18 +82,19 @@ since we don't support hard links. if (result != S_OK) { PrintError("Extract Error"); ---- a/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp -+++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp -@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se +diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +--- p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 2015-10-03 09:49:15.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 2015-12-03 02:24:40.444963545 +0000 +@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se NumFiles++; - if (_extractMode && _fi.AttribDefined) + if (!_stdOutMode && _extractMode && _fi.AttribDefined) - SetFileAttrib(_diskFilePath, _fi.Attrib); + SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); - RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted)); - return S_OK; - COM_TRY_END -@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s) + + RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted))); + +@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha } } @@ -102,7 +105,7 @@ since we don't support hard links. CRecordVector pairs; pairs.ClearAndSetSize(_extractedFolderPaths.Size()); unsigned i; -@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs +@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs (WriteATime && ATimeDefined) ? &ATime : NULL, (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL)); } @@ -116,8 +119,9 @@ since we don't support hard links. + + return result; } ---- a/CPP/7zip/UI/Common/ArchiveExtractCallback.h -+++ b/CPP/7zip/UI/Common/ArchiveExtractCallback.h +diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.h p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.h +--- p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.h 2015-10-03 11:29:09.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.h 2015-12-03 02:22:47.074724204 +0000 @@ -6,6 +6,8 @@ #include "../../../Common/MyCom.h" #include "../../../Common/Wildcard.h" @@ -127,7 +131,7 @@ since we don't support hard links. #include "../../IPassword.h" #include "../../Common/FileStreams.h" -@@ -213,6 +215,8 @@ class CArchiveExtractCallback: +@@ -237,6 +239,8 @@ class CArchiveExtractCallback: bool _saclEnabled; #endif @@ -136,18 +140,19 @@ since we don't support hard links. void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); HRESULT GetUnpackSize(); -@@ -293,7 +297,7 @@ public: - _baseParentFolder = indexInArc; +@@ -330,7 +334,7 @@ public: } + #endif - HRESULT SetDirsTimes(); + HRESULT SetFinalAttribs(); }; - #endif ---- a/CPP/7zip/UI/Common/Extract.cpp -+++ b/CPP/7zip/UI/Common/Extract.cpp -@@ -170,7 +170,7 @@ static HRESULT DecompressArchive( + bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item); +diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/Extract.cpp p7zip_15.09/CPP/7zip/UI/Common/Extract.cpp +--- p7zip_15.09.orig/CPP/7zip/UI/Common/Extract.cpp 2015-09-07 20:47:32.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/UI/Common/Extract.cpp 2015-12-03 02:22:47.075724215 +0000 +@@ -207,7 +207,7 @@ static HRESULT DecompressArchive( else result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs); if (result == S_OK && !options.StdInMode) @@ -156,9 +161,10 @@ since we don't support hard links. return callback->ExtractResult(result); } ---- a/CPP/Windows/FileDir.cpp -+++ b/CPP/Windows/FileDir.cpp -@@ -343,7 +343,8 @@ static int convert_to_symlink(const char +diff -rup p7zip_15.09.orig/CPP/Windows/FileDir.cpp p7zip_15.09/CPP/Windows/FileDir.cpp +--- p7zip_15.09.orig/CPP/Windows/FileDir.cpp 2015-10-10 13:37:41.000000000 +0100 ++++ p7zip_15.09/CPP/Windows/FileDir.cpp 2015-12-03 02:22:47.075724215 +0000 +@@ -347,7 +347,8 @@ static int convert_to_symlink(const char return -1; } @@ -168,7 +174,7 @@ since we don't support hard links. { if (!fileName) { SetLastError(ERROR_PATH_NOT_FOUND); -@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD +@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD stat_info.st_mode = fileAttributes >> 16; #ifdef ENV_HAVE_LSTAT if (S_ISLNK(stat_info.st_mode)) { @@ -179,7 +185,7 @@ since we don't support hard links. TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes))) return false; } -@@ -885,6 +888,43 @@ bool CTempDir::Remove() +@@ -814,6 +817,43 @@ bool CTempDir::Remove() return !_mustBeDeleted; } @@ -222,9 +228,10 @@ since we don't support hard links. + }}} - ---- a/CPP/Windows/FileDir.h -+++ b/CPP/Windows/FileDir.h + #ifndef _SFX +diff -rup p7zip_15.09.orig/CPP/Windows/FileDir.h p7zip_15.09/CPP/Windows/FileDir.h +--- p7zip_15.09.orig/CPP/Windows/FileDir.h 2015-06-19 11:52:06.000000000 +0100 ++++ p7zip_15.09/CPP/Windows/FileDir.h 2015-12-03 02:22:47.075724215 +0000 @@ -4,6 +4,7 @@ #define __WINDOWS_FILE_DIR_H @@ -249,7 +256,7 @@ since we don't support hard links. bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); #ifndef UNDER_CE -@@ -69,6 +73,31 @@ public: +@@ -76,6 +80,31 @@ public: bool Remove(); }; From 967a650f9cd719ebafca4cdf6d4296e9be67c16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 22 Jan 2016 03:16:50 +0000 Subject: [PATCH 53/86] Add license tag - better solutions for "create unowned directory" (#917366) --- p7zip.spec | 15 +++-- p7zip_15.09-no7zG_and_7zFM.patch | 15 +++++ p7zip_9.20.1-norar.patch | 102 ------------------------------- 3 files changed, 25 insertions(+), 107 deletions(-) create mode 100644 p7zip_15.09-no7zG_and_7zFM.patch delete mode 100644 p7zip_9.20.1-norar.patch diff --git a/p7zip.spec b/p7zip.spec index c4a0887..fd18d7c 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,13 +1,13 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 4%{?dist} +Release: 5%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving 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 +#Source: http://downloads.sf.net/p7zip/p7zip_%%{version}_src_all.tar.bz2 # VERSION= # wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 @@ -51,6 +51,8 @@ This package contains also a virtual file system for Midnight Commander. # can include them in %%doc mv DOC docs mv ChangeLog README TODO docs/ +# move license files +mv docs/License.txt docs/copying.txt . # And fix useless executable bit while we're at it find docs -type f -exec chmod -x {} \; find contrib -type f -exec chmod -x {} \; @@ -89,10 +91,9 @@ make install \ %files %doc docs/* +%license copying.txt License.txt %{_bindir}/7za -%dir %{_libexecdir}/p7zip/ -%{_libexecdir}/p7zip/7za -%{_libexecdir}/p7zip/7zCon.sfx +%{_libexecdir}/p7zip/ %{_mandir}/man1/7za.1* %exclude %{_mandir}/man1/7zr.1* @@ -108,6 +109,10 @@ make install \ %changelog +* Fri Jan 22 2016 SĂŠrgio Basto - 15.09-5 +- Add license tag +- better solutions for "create unowned directory" (#917366) + * Thu Dec 03 2015 SĂŠrgio Basto - 15.09-4 - Fix CVE-2015-1038 (#1179505) diff --git a/p7zip_15.09-no7zG_and_7zFM.patch b/p7zip_15.09-no7zG_and_7zFM.patch new file mode 100644 index 0000000..1a3e3ba --- /dev/null +++ b/p7zip_15.09-no7zG_and_7zFM.patch @@ -0,0 +1,15 @@ +diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt +--- p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt 2015-06-21 20:53:26.000000000 +0100 ++++ p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt 2015-12-21 04:09:58.900036833 +0000 +@@ -27,9 +27,9 @@ add_subdirectory(7za) + + add_subdirectory(7z_) + +-add_subdirectory(7zG) ++#add_subdirectory(7zG) + +-add_subdirectory(7zFM) ++#add_subdirectory(7zFM) + + add_subdirectory(7zr) + diff --git a/p7zip_9.20.1-norar.patch b/p7zip_9.20.1-norar.patch deleted file mode 100644 index e78bab5..0000000 --- a/p7zip_9.20.1-norar.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naupr p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 16:41:43.000000000 +0100 -+++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2011-07-26 14:11:12.480236487 +0200 -@@ -158,14 +158,6 @@ NSIS_OBJS = \ - NsisIn.o \ - NsisRegister.o \ - --RAR_OBJS = \ -- RarHandler.o \ -- RarHeader.o \ -- RarIn.o \ -- RarItem.o \ -- RarVolumeInStream.o \ -- RarRegister.o \ -- - TAR_OBJS = \ - TarHandler.o \ - TarHandlerOut.o \ -@@ -243,13 +235,6 @@ COMPRESS_OBJS = \ - ZlibEncoder.o \ - ZDecoder.o \ - --COMPRESS_OBJS_NON_FREE = \ -- Rar1Decoder.o \ -- Rar2Decoder.o \ -- Rar3Decoder.o \ -- Rar3Vm.o \ -- RarCodecsRegister.o \ -- - CRYPTO_OBJS = \ - 7zAes.o \ - 7zAesRegister.o \ -@@ -257,8 +242,6 @@ CRYPTO_OBJS = \ - MyAes.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- RarAes.o \ - Sha1.o \ - WzAes.o \ - ZipCrypto.o \ -@@ -314,7 +297,6 @@ OBJS = \ - $(HFS_OBJS) \ - $(ISO_OBJS) \ - $(NSIS_OBJS) \ -- $(RAR_OBJS) \ - $(TAR_OBJS) \ - $(UDF_OBJS) \ - $(WIM_OBJS) \ -diff -Naupr p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-11-07 16:42:33.000000000 +0100 -+++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile.list 2011-07-26 14:11:31.068174008 +0200 -@@ -133,13 +133,6 @@ SRCS=\ - ../../Archive/Nsis/NsisIn.cpp \ - ../../Archive/Nsis/NsisRegister.cpp \ - \ -- ../../Archive/Rar/RarHandler.cpp \ -- ../../Archive/Rar/RarHeader.cpp \ -- ../../Archive/Rar/RarIn.cpp \ -- ../../Archive/Rar/RarItem.cpp \ -- ../../Archive/Rar/RarVolumeInStream.cpp \ -- ../../Archive/Rar/RarRegister.cpp \ -- \ - ../../Archive/Tar/TarHandler.cpp \ - ../../Archive/Tar/TarHandlerOut.cpp \ - ../../Archive/Tar/TarHeader.cpp \ -@@ -220,8 +213,6 @@ SRCS=\ - ../../Crypto/RandGen.cpp \ - ../../Crypto/Sha1.cpp \ - ../../Crypto/WzAes.cpp \ -- ../../Crypto/Rar20Crypto.cpp \ -- ../../Crypto/RarAes.cpp \ - ../../Crypto/ZipCrypto.cpp \ - ../../Crypto/ZipStrong.cpp - -diff -Naupr p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile ---- p7zip_9.20.1.orig/makefile 2011-03-13 12:52:45.000000000 +0100 -+++ p7zip_9.20.1/makefile 2011-07-26 14:11:43.546132132 +0200 -@@ -56,7 +56,6 @@ depend: - $(MAKE) -C CPP/7zip/UI/Client7z depend - $(MAKE) -C CPP/7zip/UI/Console depend - $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend -- $(MAKE) -C CPP/7zip/Compress/Rar depend - $(MAKE) -C CPP/7zip/UI/GUI depend - $(MAKE) -C CPP/7zip/UI/FileManager depend - $(MAKE) -C check/my_86_filter depend -@@ -68,7 +67,6 @@ sfx: common - common7z:common - $(MKDIR) bin/Codecs - $(MAKE) -C CPP/7zip/Bundles/Format7zFree all -- $(MAKE) -C CPP/7zip/Compress/Rar all - - 7z: common7z - $(MAKE) -C CPP/7zip/UI/Console all -@@ -93,7 +91,6 @@ clean: - $(MAKE) -C CPP/7zip/UI/FileManager clean - $(MAKE) -C CPP/7zip/UI/GUI clean - $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean -- $(MAKE) -C CPP/7zip/Compress/Rar clean - $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean - $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean - $(MAKE) -C CPP/7zip/TEST/TestUI clean From 99b0e8f63001c4e33452cd8a5d235f1febf7239d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 22 Jan 2016 03:42:31 +0000 Subject: [PATCH 54/86] Add note in License file stating: That we removed non-Free unrar code from the sources (#190277) --- p7zip_15.09-norar_cmake.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.09-norar_cmake.patch index f9c7540..7da05f4 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.09-norar_cmake.patch @@ -146,3 +146,12 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 add_subdirectory(7zr) +--- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 ++++ p7zip_15.09/DOC/License.txt 2016-01-22 03:41:19.376362458 +0000 +@@ -1,3 +1,6 @@ ++ Fedora package note: non-Free unrar code have been removed from the sources ++ (#190277) ++ + 7-Zip source code + ~~~~~~~~~~~~~~~~~ + License for use and distribution From 11f567117880379373d56b5f0763960b3029a095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 22 Jan 2016 04:17:40 +0000 Subject: [PATCH 55/86] Stating in License.txt file that we removed non-Free unrar code from sources (#190277) - Fix incorrect fsf address in the license files. - Add p7zip_15.09-no7zG_and_7zFM.patch in a diferent patch. --- p7zip.spec | 10 +++- p7zip_15.09-norar_cmake.patch | 92 +++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 11 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index fd18d7c..c79e118 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 5%{?dist} +Release: 6%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -18,6 +18,7 @@ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.09-norar_cmake.patch Patch1: p7zip_15.09-s390.patch Patch2: p7zip-15.09-CVE-2015-1038.patch +Patch3: p7zip_15.09-no7zG_and_7zFM.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -47,6 +48,7 @@ This package contains also a virtual file system for Midnight Commander. %patch0 -p1 -b .norar_cmake %patch1 -p1 -b .s390 %patch2 -p1 -b .CVE-2015-1038 +%patch3 -p1 -b .no7zG_and_7zFM.patch # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -109,6 +111,12 @@ make install \ %changelog +* Fri Jan 22 2016 SĂŠrgio Basto - 15.09-6 +- Stating in License.txt file that we removed non-Free unrar code + from sources (#190277) +- Fix incorrect fsf address in the license files. +- Add p7zip_15.09-no7zG_and_7zFM.patch in a diferent patch. + * Fri Jan 22 2016 SĂŠrgio Basto - 15.09-5 - Add license tag - better solutions for "create unowned directory" (#917366) diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.09-norar_cmake.patch index 7da05f4..dd0f797 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.09-norar_cmake.patch @@ -132,22 +132,84 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean $(MAKE) -C CPP/7zip/TEST/TestUI clean ---- p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt 2015-06-21 20:53:26.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt 2015-11-05 14:35:42.849613481 +0000 -@@ -27,9 +27,9 @@ add_subdirectory(7za) +diff -up p7zip_15.09.orig/DOC/copying.txt p7zip_15.09/DOC/copying.txt +--- p7zip_15.09.orig/DOC/copying.txt 2008-08-01 10:56:23.000000000 +0100 ++++ p7zip_15.09/DOC/copying.txt 2016-01-22 04:00:02.525966083 +0000 +@@ -1,8 +1,8 @@ +- GNU LESSER GENERAL PUBLIC LICENSE +- Version 2.1, February 1999 ++ GNU LESSER GENERAL PUBLIC LICENSE ++ Version 2.1, February 1999 - add_subdirectory(7z_) + Copyright (C) 1991, 1999 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. --add_subdirectory(7zG) -+#add_subdirectory(7zG) +@@ -10,7 +10,7 @@ + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] --add_subdirectory(7zFM) -+#add_subdirectory(7zFM) +- Preamble ++ Preamble - add_subdirectory(7zr) + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -112,7 +112,7 @@ modification follow. Pay close attentio + former contains code derived from the library, whereas the latter must + be combined with the library in order to run. + +- GNU LESSER GENERAL PUBLIC LICENSE ++ GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 0. This License Agreement applies to any software library or other +@@ -146,7 +146,7 @@ such a program is covered only if its co + on the Library (independent of the use of the Library in a tool for + writing it). Whether that is true depends on what the Library does + and what the program that uses the Library does. +- ++ + 1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an +@@ -432,7 +432,7 @@ decision will be guided by the two goals + of all derivatives of our free software and of promoting the sharing + and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH A + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + +- END OF TERMS AND CONDITIONS ++ END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + +@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Also add information on how to contact you by electronic and paper mail. + +@@ -500,5 +500,3 @@ necessary. Here is a sample; alter the + Ty Coon, President of Vice + + That's all there is to it! +- +- +diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt --- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 -+++ p7zip_15.09/DOC/License.txt 2016-01-22 03:41:19.376362458 +0000 ++++ p7zip_15.09/DOC/License.txt 2016-01-22 04:04:38.314054043 +0000 @@ -1,3 +1,6 @@ + Fedora package note: non-Free unrar code have been removed from the sources + (#190277) @@ -155,3 +217,13 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 7-Zip source code ~~~~~~~~~~~~~~~~~ License for use and distribution +@@ -29,7 +32,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ++ USA + + + unRAR restriction From 091dcccab6fc270f0dea24dbeb6cc3c1870c086f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 22 Jan 2016 04:45:45 +0000 Subject: [PATCH 56/86] Split incorrect-fsf-address.patch and do not pack backup files --- p7zip.spec | 9 ++- p7zip_15.09-incorrect-fsf-address.patch | 88 +++++++++++++++++++++++++ p7zip_15.09-norar_cmake.patch | 85 ------------------------ 3 files changed, 96 insertions(+), 86 deletions(-) create mode 100644 p7zip_15.09-incorrect-fsf-address.patch diff --git a/p7zip.spec b/p7zip.spec index c79e118..5707ac7 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 6%{?dist} +Release: 7%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -19,6 +19,7 @@ Patch0: p7zip_15.09-norar_cmake.patch Patch1: p7zip_15.09-s390.patch Patch2: p7zip-15.09-CVE-2015-1038.patch Patch3: p7zip_15.09-no7zG_and_7zFM.patch +Patch4: p7zip_15.09-incorrect-fsf-address.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -46,9 +47,12 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -q -n %{name}_%{version} %patch0 -p1 -b .norar_cmake +#Remove backups from DOC directory +rm DOC/License.txt.* %patch1 -p1 -b .s390 %patch2 -p1 -b .CVE-2015-1038 %patch3 -p1 -b .no7zG_and_7zFM.patch +%patch4 -p1 # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -111,6 +115,9 @@ make install \ %changelog +* Fri Jan 22 2016 SĂŠrgio Basto - 15.09-7 +- Split incorrect-fsf-address.patch and do not pack backup files + * Fri Jan 22 2016 SĂŠrgio Basto - 15.09-6 - Stating in License.txt file that we removed non-Free unrar code from sources (#190277) diff --git a/p7zip_15.09-incorrect-fsf-address.patch b/p7zip_15.09-incorrect-fsf-address.patch new file mode 100644 index 0000000..4cb1fb1 --- /dev/null +++ b/p7zip_15.09-incorrect-fsf-address.patch @@ -0,0 +1,88 @@ +diff -up p7zip_15.09.orig/DOC/copying.txt p7zip_15.09/DOC/copying.txt +--- p7zip_15.09.orig/DOC/copying.txt 2008-08-01 10:56:23.000000000 +0100 ++++ p7zip_15.09/DOC/copying.txt 2016-01-22 04:00:02.525966083 +0000 +@@ -1,8 +1,8 @@ +- GNU LESSER GENERAL PUBLIC LICENSE +- Version 2.1, February 1999 ++ GNU LESSER GENERAL PUBLIC LICENSE ++ Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -10,7 +10,7 @@ + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +- Preamble ++ Preamble + + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -112,7 +112,7 @@ modification follow. Pay close attentio + former contains code derived from the library, whereas the latter must + be combined with the library in order to run. + +- GNU LESSER GENERAL PUBLIC LICENSE ++ GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +@@ -146,7 +146,7 @@ such a program is covered only if its co + on the Library (independent of the use of the Library in a tool for + writing it). Whether that is true depends on what the Library does + and what the program that uses the Library does. +- ++ + 1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an +@@ -432,7 +432,7 @@ decision will be guided by the two goals + of all derivatives of our free software and of promoting the sharing + and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH A + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + +- END OF TERMS AND CONDITIONS ++ END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + +@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Also add information on how to contact you by electronic and paper mail. + +@@ -500,5 +500,3 @@ necessary. Here is a sample; alter the + Ty Coon, President of Vice + + That's all there is to it! +- +- +diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt +--- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 ++++ p7zip_15.09/DOC/License.txt 2016-01-22 04:04:38.314054043 +0000 +@@ -32,7 +35,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ++ USA + + + unRAR restriction diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.09-norar_cmake.patch index dd0f797..e11c89e 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.09-norar_cmake.patch @@ -132,81 +132,6 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean $(MAKE) -C CPP/7zip/TEST/TestUI clean -diff -up p7zip_15.09.orig/DOC/copying.txt p7zip_15.09/DOC/copying.txt ---- p7zip_15.09.orig/DOC/copying.txt 2008-08-01 10:56:23.000000000 +0100 -+++ p7zip_15.09/DOC/copying.txt 2016-01-22 04:00:02.525966083 +0000 -@@ -1,8 +1,8 @@ -- GNU LESSER GENERAL PUBLIC LICENSE -- Version 2.1, February 1999 -+ GNU LESSER GENERAL PUBLIC LICENSE -+ Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -10,7 +10,7 @@ - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -112,7 +112,7 @@ modification follow. Pay close attentio - former contains code derived from the library, whereas the latter must - be combined with the library in order to run. - -- GNU LESSER GENERAL PUBLIC LICENSE -+ GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -@@ -146,7 +146,7 @@ such a program is covered only if its co - on the Library (independent of the use of the Library in a tool for - writing it). Whether that is true depends on what the Library does - and what the program that uses the Library does. -- -+ - 1. You may copy and distribute verbatim copies of the Library's - complete source code as you receive it, in any medium, provided that - you conspicuously and appropriately publish on each copy an -@@ -432,7 +432,7 @@ decision will be guided by the two goals - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH A - SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -- END OF TERMS AND CONDITIONS -+ END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - -@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Also add information on how to contact you by electronic and paper mail. - -@@ -500,5 +500,3 @@ necessary. Here is a sample; alter the - Ty Coon, President of Vice - - That's all there is to it! -- -- diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt --- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 +++ p7zip_15.09/DOC/License.txt 2016-01-22 04:04:38.314054043 +0000 @@ -217,13 +142,3 @@ diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt 7-Zip source code ~~~~~~~~~~~~~~~~~ License for use and distribution -@@ -29,7 +32,8 @@ - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -+ USA - - - unRAR restriction From 2351137ae6853a40d443679336ec3dd874be9308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 22 Jan 2016 05:06:16 +0000 Subject: [PATCH 57/86] Revert better solutions for "create unowned directory" --- p7zip.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 5707ac7..4ecff16 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 7%{?dist} +Release: 8%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -99,7 +99,9 @@ make install \ %doc docs/* %license copying.txt License.txt %{_bindir}/7za -%{_libexecdir}/p7zip/ +%dir %{_libexecdir}/p7zip/ +%{_libexecdir}/p7zip/7za +%{_libexecdir}/p7zip/7zCon.sfx %{_mandir}/man1/7za.1* %exclude %{_mandir}/man1/7zr.1* @@ -115,6 +117,9 @@ make install \ %changelog +* Fri Jan 22 2016 SĂŠrgio Basto - 15.09-8 +- Revert better solutions for "create unowned directory" + * Fri Jan 22 2016 SĂŠrgio Basto - 15.09-7 - Split incorrect-fsf-address.patch and do not pack backup files From 0a1f339d0d6c0f731516bbb54cc29ce9b6706529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 25 Jan 2016 04:46:47 +0000 Subject: [PATCH 58/86] Add 02_man.patch from Debian --- 02_man.patch | 29 +++++++++++++++++++++++++++++ p7zip.spec | 13 ++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 02_man.patch diff --git a/02_man.patch b/02_man.patch new file mode 100644 index 0000000..aa348a4 --- /dev/null +++ b/02_man.patch @@ -0,0 +1,29 @@ +Index: p7zip-9.20.1~dfsg.1/man1/7z.1 +=================================================================== +--- p7zip-9.20.1~dfsg.1.orig/man1/7z.1 2011-08-03 12:39:44.000000000 +0200 ++++ p7zip-9.20.1~dfsg.1/man1/7z.1 2011-08-03 12:39:51.000000000 +0200 +@@ -10,7 +10,7 @@ + .BR ... + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. ++7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .TP + 7z uses plugins to handle archives. + .PP +Index: p7zip-9.20.1~dfsg.1/man1/7za.1 +=================================================================== +--- p7zip-9.20.1~dfsg.1.orig/man1/7za.1 2011-08-03 12:39:45.000000000 +0200 ++++ p7zip-9.20.1~dfsg.1/man1/7za.1 2011-08-03 12:40:25.000000000 +0200 +@@ -10,9 +10,9 @@ + .BR ... + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. ++7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .TP +-7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others. ++7za is a stand-alone executable. 7za handles less archive formats than 7z. + .PP + .SH FUNCTION LETTERS + .TP diff --git a/p7zip.spec b/p7zip.spec index 4ecff16..1bfe1e9 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 8%{?dist} +Release: 9%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -20,6 +20,8 @@ Patch1: p7zip_15.09-s390.patch Patch2: p7zip-15.09-CVE-2015-1038.patch Patch3: p7zip_15.09-no7zG_and_7zFM.patch Patch4: p7zip_15.09-incorrect-fsf-address.patch +# from Debain +Patch5: 02_man.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -53,6 +55,7 @@ rm DOC/License.txt.* %patch2 -p1 -b .CVE-2015-1038 %patch3 -p1 -b .no7zG_and_7zFM.patch %patch4 -p1 +%patch5 -p1 -b .man # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -93,6 +96,11 @@ make install \ DEST_BIN=%{_bindir} \ DEST_SHARE=%{_libexecdir}/p7zip \ DEST_MAN=%{_mandir} +find %{buildroot} + + +%check +find %{buildroot} %files @@ -117,6 +125,9 @@ make install \ %changelog +* Mon Jan 25 2016 SĂŠrgio Basto - 15.09-9 +- Add 02_man.patch from Debian + * Fri Jan 22 2016 SĂŠrgio Basto - 15.09-8 - Revert better solutions for "create unowned directory" From acc5916bc302d795a47c6a637e6213ef0986e188 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 11:48:37 +0000 Subject: [PATCH 59/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 1bfe1e9..ec7fdce 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 9%{?dist} +Release: 10%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -125,6 +125,9 @@ find %{buildroot} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 15.09-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 25 2016 SĂŠrgio Basto - 15.09-9 - Add 02_man.patch from Debian From d586e746be817fa4d3974285d78241df697ada27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 16 Mar 2016 03:49:16 +0000 Subject: [PATCH 60/86] Update to 15.14 . - Rebase norar_cmake.patch - Minor improvement in snippet of documentation. - Drop patch1, from changelog build on s390 is fixed. - Drop p7zip-15.09-CVE-2015-1038.patch, from changelog if fixed. - Drop upstreamed p7zip_15.09-incorrect-fsf-address.patch . - Drop p7zip_15.09-no7zG_and_7zFM.patch, p7zip build is fixed. - Add sub-package p7zip-gui with 7zG. --- .gitignore | 1 + p7zip.spec | 78 ++++++---- p7zip_15.09-incorrect-fsf-address.patch | 88 ----------- p7zip_15.09-s390.patch | 11 -- ...ake.patch => p7zip_15.14-norar_cmake.patch | 145 +++++++++--------- sources | 2 +- 6 files changed, 128 insertions(+), 197 deletions(-) delete mode 100644 p7zip_15.09-incorrect-fsf-address.patch delete mode 100644 p7zip_15.09-s390.patch rename p7zip_15.09-norar_cmake.patch => p7zip_15.14-norar_cmake.patch (71%) diff --git a/.gitignore b/.gitignore index a70d0d2..31d261c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /p7zip_9.13_src_all-norar.tar.bz2 /p7zip_9.20.1_src_all-norar.tar.bz2 /p7zip_15.09_src_all-norar.tar.bz2 +/p7zip_15.14_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index ec7fdce..6f7054c 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,30 +1,28 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 15.09 -Release: 10%{?dist} +Version: 15.14 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving 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 -# VERSION= +# export VERSION=15.14 # wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 -# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar* +# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto,QMAKE}/Rar* # rm p7zip_${VERSION}/DOC/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} Source: p7zip_%{version}_src_all-norar.tar.bz2 -Patch0: p7zip_15.09-norar_cmake.patch -Patch1: p7zip_15.09-s390.patch -Patch2: p7zip-15.09-CVE-2015-1038.patch -Patch3: p7zip_15.09-no7zG_and_7zFM.patch -Patch4: p7zip_15.09-incorrect-fsf-address.patch +Patch0: p7zip_15.14-norar_cmake.patch # from Debain Patch5: 02_man.patch BuildRequires: cmake -# BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI +# for 7zG GUI +BuildRequires: wxGTK-devel +BuildRequires: kde-filesystem %ifarch %{ix86} BuildRequires: nasm %endif @@ -45,31 +43,34 @@ Group: Applications/Archiving Additional plugins that can be used with 7z to extend its abilities. This package contains also a virtual file system for Midnight Commander. +%package gui +Summary: 7zG - 7-Zip GUI version +Requires: kde-filesystem + +%description gui +7zG is a gui provide by p7zip and it is now in beta stage. +Also add some context menus for KDE4. +This package is *experimental*. + %prep %setup -q -n %{name}_%{version} %patch0 -p1 -b .norar_cmake #Remove backups from DOC directory rm DOC/License.txt.* -%patch1 -p1 -b .s390 -%patch2 -p1 -b .CVE-2015-1038 -%patch3 -p1 -b .no7zG_and_7zFM.patch -%patch4 -p1 %patch5 -p1 -b .man -# Move docs early so that they don't get installed by "make install" and we -# can include them in %%doc -mv DOC docs -mv ChangeLog README TODO docs/ # move license files -mv docs/License.txt docs/copying.txt . -# And fix useless executable bit while we're at it -find docs -type f -exec chmod -x {} \; -find contrib -type f -exec chmod -x {} \; +mv DOC/License.txt DOC/copying.txt . + +# no need anymore +## And fix useless executable bit while we're at it +#find docs -type f -exec chmod -x {} \; +#find contrib -type f -exec chmod -x {} \; %build pushd CPP/7zip/CMAKE/ -./generate.sh +sh ./generate.sh popd %ifarch %{ix86} cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine @@ -81,7 +82,7 @@ cp -f makefile.linux_amd64_asm makefile.machine cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -make %{?_smp_mflags} all2 \ +make %{?_smp_mflags} all2 7zG \ OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -96,15 +97,21 @@ make install \ DEST_BIN=%{_bindir} \ DEST_SHARE=%{_libexecdir}/p7zip \ DEST_MAN=%{_mandir} -find %{buildroot} +# remove redundant DOC dir +mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip +rmdir %{buildroot}%{_docdir}/p7zip/DOC/ + +mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ +cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ %check -find %{buildroot} +make test +#make test_7zG || : %files -%doc docs/* +%{_docdir}/p7zip %license copying.txt License.txt %{_bindir}/7za %dir %{_libexecdir}/p7zip/ @@ -123,8 +130,25 @@ find %{buildroot} #{_libexecdir}/p7zip/Formats/ %{_mandir}/man1/7z.1* +%files gui +%{_bindir}/7zG +%{_bindir}/p7zipForFilemanager +%{_libexecdir}/p7zip/7zG +%{_libexecdir}/p7zip/Lang +%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop + %changelog +* Tue Mar 15 2016 SĂŠrgio Basto - 15.14-1 +- Update to 15.14 . +- Rebase norar_cmake.patch +- Minor improvement in snippet of documentation. +- Drop patch1, from changelog build on s390 is fixed. +- Drop p7zip-15.09-CVE-2015-1038.patch, from changelog if fixed. +- Drop upstreamed p7zip_15.09-incorrect-fsf-address.patch . +- Drop p7zip_15.09-no7zG_and_7zFM.patch, p7zip build is fixed. +- Add sub-package p7zip-gui with 7zG. + * Thu Feb 04 2016 Fedora Release Engineering - 15.09-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/p7zip_15.09-incorrect-fsf-address.patch b/p7zip_15.09-incorrect-fsf-address.patch deleted file mode 100644 index 4cb1fb1..0000000 --- a/p7zip_15.09-incorrect-fsf-address.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -up p7zip_15.09.orig/DOC/copying.txt p7zip_15.09/DOC/copying.txt ---- p7zip_15.09.orig/DOC/copying.txt 2008-08-01 10:56:23.000000000 +0100 -+++ p7zip_15.09/DOC/copying.txt 2016-01-22 04:00:02.525966083 +0000 -@@ -1,8 +1,8 @@ -- GNU LESSER GENERAL PUBLIC LICENSE -- Version 2.1, February 1999 -+ GNU LESSER GENERAL PUBLIC LICENSE -+ Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -10,7 +10,7 @@ - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -112,7 +112,7 @@ modification follow. Pay close attentio - former contains code derived from the library, whereas the latter must - be combined with the library in order to run. - -- GNU LESSER GENERAL PUBLIC LICENSE -+ GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -@@ -146,7 +146,7 @@ such a program is covered only if its co - on the Library (independent of the use of the Library in a tool for - writing it). Whether that is true depends on what the Library does - and what the program that uses the Library does. -- -+ - 1. You may copy and distribute verbatim copies of the Library's - complete source code as you receive it, in any medium, provided that - you conspicuously and appropriately publish on each copy an -@@ -432,7 +432,7 @@ decision will be guided by the two goals - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH A - SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - DAMAGES. - -- END OF TERMS AND CONDITIONS -+ END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - -@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Also add information on how to contact you by electronic and paper mail. - -@@ -500,5 +500,3 @@ necessary. Here is a sample; alter the - Ty Coon, President of Vice - - That's all there is to it! -- -- -diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt ---- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 -+++ p7zip_15.09/DOC/License.txt 2016-01-22 04:04:38.314054043 +0000 -@@ -32,7 +35,8 @@ - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -+ USA - - - unRAR restriction diff --git a/p7zip_15.09-s390.patch b/p7zip_15.09-s390.patch deleted file mode 100644 index 5ae3af2..0000000 --- a/p7zip_15.09-s390.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- p7zip_15.09.orig/C/CpuArch.h 2015-09-27 15:31:20.000000000 -0400 -+++ p7zip_15.09/C/CpuArch.h 2015-12-01 06:16:38.000000000 -0500 -@@ -77,7 +77,7 @@ - || defined(__MIPSEB) \ - || defined(_MIPSEB) \ - || defined(__m68k__) \ -- || defined(__s390x__) -+ || defined(__s390__) - #define MY_CPU_BE - #endif - diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.14-norar_cmake.patch similarity index 71% rename from p7zip_15.09-norar_cmake.patch rename to p7zip_15.14-norar_cmake.patch index e11c89e..41a351d 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.14-norar_cmake.patch @@ -1,50 +1,7 @@ -diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.09/CPP/7zip/CMAKE/generate.sh ---- p7zip_15.09.orig/CPP/7zip/CMAKE/generate.sh 2015-01-18 17:14:54.000000000 +0000 -+++ p7zip_15.09/CPP/7zip/CMAKE/generate.sh 2015-11-05 03:55:11.789432894 +0000 -@@ -15,14 +15,14 @@ CURDIR=$PWD - cd $CURDIR - doit "Unix" "Unix Makefiles" - --cd $CURDIR --doit "codeblocks" "CodeBlocks - Unix Makefiles" -+#cd $CURDIR -+#doit "codeblocks" "CodeBlocks - Unix Makefiles" - - #cd $CURDIR - #doit "KDevelop3" "KDevelop3" - --cd $CURDIR --doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" -+#cd $CURDIR -+#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" - - #cd $CURDIR - #doit "ninja" "Ninja" -diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.09/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt ---- p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-10-10 13:30:03.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-11-05 04:21:50.386888680 +0000 -@@ -127,8 +127,6 @@ add_library(7z MODULE - "../../../../CPP/7zip/Archive/PeHandler.cpp" - "../../../../CPP/7zip/Archive/PpmdHandler.cpp" - "../../../../CPP/7zip/Archive/QcowHandler.cpp" -- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" -- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" - "../../../../CPP/7zip/Archive/RpmHandler.cpp" - "../../../../CPP/7zip/Archive/SplitHandler.cpp" - "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" -@@ -231,9 +229,6 @@ add_library(7z MODULE - "../../../../CPP/7zip/Crypto/MyAesReg.cpp" - "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" - "../../../../CPP/7zip/Crypto/RandGen.cpp" -- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" -- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" -- "../../../../CPP/7zip/Crypto/RarAes.cpp" - "../../../../CPP/7zip/Crypto/WzAes.cpp" - "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" - "../../../../CPP/7zip/Crypto/ZipStrong.cpp" ---- p7zip_15.09.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-10-10 13:30:03.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-11-05 13:22:50.715659911 +0000 -@@ -89,8 +89,6 @@ SRCS=\ +diff -rup p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-10 07:27:16.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-15 13:50:22.638470716 +0000 +@@ -87,8 +87,6 @@ SRCS=\ ../../../../CPP/7zip/Archive/PeHandler.cpp \ ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ ../../../../CPP/7zip/Archive/QcowHandler.cpp \ @@ -53,7 +10,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 ../../../../CPP/7zip/Archive/RpmHandler.cpp \ ../../../../CPP/7zip/Archive/SplitHandler.cpp \ ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -193,9 +191,6 @@ SRCS=\ +@@ -191,9 +189,6 @@ SRCS=\ ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ ../../../../CPP/7zip/Crypto/RandGen.cpp \ @@ -63,7 +20,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 ../../../../CPP/7zip/Crypto/WzAes.cpp \ ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ -@@ -491,10 +486,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc +@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp @@ -74,7 +31,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp -@@ -699,12 +690,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/ +@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/ $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp @@ -87,7 +44,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp -@@ -877,8 +862,6 @@ OBJS=\ +@@ -869,8 +854,6 @@ OBJS=\ PeHandler.o \ PpmdHandler.o \ QcowHandler.o \ @@ -96,7 +53,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 RpmHandler.o \ SplitHandler.o \ SquashfsHandler.o \ -@@ -981,9 +964,6 @@ OBJS=\ +@@ -973,9 +956,6 @@ OBJS=\ MyAesReg.o \ Pbkdf2HmacSha1.o \ RandGen.o \ @@ -106,9 +63,67 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 WzAes.o \ ZipCrypto.o \ ZipStrong.o \ ---- p7zip_15.09.orig/makefile 2015-10-05 09:39:57.000000000 +0100 -+++ p7zip_15.09/makefile 2015-11-05 13:36:01.160793573 +0000 -@@ -70,7 +70,6 @@ depend: +diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt +--- p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-10 07:27:16.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-15 13:50:22.639470728 +0000 +@@ -126,8 +126,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Archive/PeHandler.cpp" + "../../../../CPP/7zip/Archive/PpmdHandler.cpp" + "../../../../CPP/7zip/Archive/QcowHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" + "../../../../CPP/7zip/Archive/RpmHandler.cpp" + "../../../../CPP/7zip/Archive/SplitHandler.cpp" + "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" +@@ -230,9 +228,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Crypto/MyAesReg.cpp" + "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" + "../../../../CPP/7zip/Crypto/RandGen.cpp" +- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" +- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" +- "../../../../CPP/7zip/Crypto/RarAes.cpp" + "../../../../CPP/7zip/Crypto/WzAes.cpp" + "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" + "../../../../CPP/7zip/Crypto/ZipStrong.cpp" +diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.14/CPP/7zip/CMAKE/generate.sh +--- p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh 2016-02-03 04:54:00.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/CMAKE/generate.sh 2016-03-15 13:50:47.596758591 +0000 +@@ -15,15 +15,15 @@ CURDIR=$PWD + cd $CURDIR + doit "Unix" "Unix Makefiles" + +-cd $CURDIR +-doit "codeblocks" "CodeBlocks - Unix Makefiles" ++#cd $CURDIR ++#doit "codeblocks" "CodeBlocks - Unix Makefiles" + + #cd $CURDIR + #doit "KDevelop3" "KDevelop3" + +-cd $CURDIR +-doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" ++#cd $CURDIR ++#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" + +-cd $CURDIR +-doit "ninja" "Ninja" ++#cd $CURDIR ++#doit "ninja" "Ninja" + +diff -rup p7zip_15.14.orig/DOC/License.txt p7zip_15.14/DOC/License.txt +--- p7zip_15.14.orig/DOC/License.txt 2016-03-02 05:57:39.000000000 +0000 ++++ p7zip_15.14/DOC/License.txt 2016-03-15 13:50:22.640470740 +0000 +@@ -1,3 +1,6 @@ ++ Fedora package note: non-Free unrar code have been removed from the sources ++ (#190277) ++ + 7-Zip source code + ~~~~~~~~~~~~~~~~~ + License for use and distribution +diff -rup p7zip_15.14.orig/makefile p7zip_15.14/makefile +--- p7zip_15.14.orig/makefile 2016-02-29 06:28:31.000000000 +0000 ++++ p7zip_15.14/makefile 2016-03-15 13:50:22.640470740 +0000 +@@ -31,7 +31,6 @@ depend: $(MAKE) -C CPP/7zip/UI/Client7z depend $(MAKE) -C CPP/7zip/UI/Console depend $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend @@ -116,29 +131,19 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 $(MAKE) -C CPP/7zip/UI/GUI depend $(MAKE) -C CPP/7zip/UI/FileManager depend -@@ -81,7 +80,6 @@ sfx: common +@@ -42,7 +41,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs $(MAKE) -C CPP/7zip/Bundles/Format7zFree all - $(MAKE) -C CPP/7zip/Compress/Rar all - 7z: common7z - $(MAKE) -C CPP/7zip/UI/Console all -@@ -106,7 +104,6 @@ clean: + lzham:common + $(MKDIR) bin/Codecs +@@ -67,7 +65,6 @@ clean_C: $(MAKE) -C CPP/7zip/UI/FileManager clean $(MAKE) -C CPP/7zip/UI/GUI clean $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean - $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/Lzham clean $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean - $(MAKE) -C CPP/7zip/TEST/TestUI clean -diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt ---- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 -+++ p7zip_15.09/DOC/License.txt 2016-01-22 04:04:38.314054043 +0000 -@@ -1,3 +1,6 @@ -+ Fedora package note: non-Free unrar code have been removed from the sources -+ (#190277) -+ - 7-Zip source code - ~~~~~~~~~~~~~~~~~ - License for use and distribution diff --git a/sources b/sources index 25b0a88..b7a4ab1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51b361979baf8124935cfaa2888b4a10 p7zip_15.09_src_all-norar.tar.bz2 +7f19e4426635bfa5d642e6f850776341 p7zip_15.14_src_all-norar.tar.bz2 From 1203b33175649975d6b105bb0b852badad400b51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 17 Mar 2016 04:22:03 +0000 Subject: [PATCH 61/86] Fix non-executable-in-bin for p7zipForFilemanager. - Remove p7zip_compress2.desktop to not duplicate the menu entries. - Also build 7zFM, rebuild p7zip_15.14_src_all-norar.tar.bz2, to build 7zFM instead 7zFM_do_not_use. --- p7zip.spec | 16 ++++++++++++++-- sources | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 6f7054c..bb1349b 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.14 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -82,7 +82,7 @@ cp -f makefile.linux_amd64_asm makefile.machine cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -make %{?_smp_mflags} all2 7zG \ +make %{?_smp_mflags} all2 7zG 7zFM \ OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -103,7 +103,11 @@ mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip rmdir %{buildroot}%{_docdir}/p7zip/DOC/ mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ +# remove a duplicated of p7zip_compress.desktop +rm GUI/kde4/p7zip_compress2.desktop cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ +#fix non-executable-in-bin +chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %check make test @@ -132,13 +136,21 @@ make test %files gui %{_bindir}/7zG +%{_bindir}/7zFM %{_bindir}/p7zipForFilemanager %{_libexecdir}/p7zip/7zG +%{_libexecdir}/p7zip/7zFM %{_libexecdir}/p7zip/Lang %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop %changelog +* Thu Mar 17 2016 SĂŠrgio Basto - 15.14-2 +- Fix non-executable-in-bin for p7zipForFilemanager. +- Remove p7zip_compress2.desktop to not duplicate the menu entries. +- Also build 7zFM, rebuild p7zip_15.14_src_all-norar.tar.bz2, to build 7zFM + instead 7zFM_do_not_use. + * Tue Mar 15 2016 SĂŠrgio Basto - 15.14-1 - Update to 15.14 . - Rebase norar_cmake.patch diff --git a/sources b/sources index b7a4ab1..17a8df9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f19e4426635bfa5d642e6f850776341 p7zip_15.14_src_all-norar.tar.bz2 +cdffe923ad8a0c02f284b5e32bc2b581 p7zip_15.14_src_all-norar.tar.bz2 From 52fba4ffe031f14c7a4f6ca795b77b1d94c7207b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 27 Mar 2016 21:54:13 +0100 Subject: [PATCH 62/86] Update to 15.14.1 - Revert 7zFM build, upstream recomends not build it http://sourceforge.net/p/p7zip/bugs/175/ --- .gitignore | 1 + p7zip.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 31d261c..6bd4948 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /p7zip_9.20.1_src_all-norar.tar.bz2 /p7zip_15.09_src_all-norar.tar.bz2 /p7zip_15.14_src_all-norar.tar.bz2 +/p7zip_15.14.1_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index bb1349b..6d2c47f 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,14 +1,14 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 15.14 -Release: 2%{?dist} +Version: 15.14.1 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving 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 -# export VERSION=15.14 +# export VERSION=15.14.1 # wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 # rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto,QMAKE}/Rar* @@ -82,7 +82,7 @@ cp -f makefile.linux_amd64_asm makefile.machine cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -make %{?_smp_mflags} all2 7zG 7zFM \ +make %{?_smp_mflags} all2 7zG \ OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -111,6 +111,8 @@ chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %check make test +# Next test fails, because we don't have X11 envoirment ... +# Error: Unable to initialize gtk, is DISPLAY set properly? #make test_7zG || : @@ -136,15 +138,18 @@ make test %files gui %{_bindir}/7zG -%{_bindir}/7zFM %{_bindir}/p7zipForFilemanager %{_libexecdir}/p7zip/7zG -%{_libexecdir}/p7zip/7zFM %{_libexecdir}/p7zip/Lang %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop %changelog +* Sun Mar 27 2016 SĂŠrgio Basto - 15.14.1-1 +- Update to 15.14.1 +- Revert 7zFM build, upstream recomends not build it + http://sourceforge.net/p/p7zip/bugs/175/ + * Thu Mar 17 2016 SĂŠrgio Basto - 15.14-2 - Fix non-executable-in-bin for p7zipForFilemanager. - Remove p7zip_compress2.desktop to not duplicate the menu entries. diff --git a/sources b/sources index 17a8df9..1618c62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cdffe923ad8a0c02f284b5e32bc2b581 p7zip_15.14_src_all-norar.tar.bz2 +77def69eb3c5281702ce676e92d090f7 p7zip_15.14.1_src_all-norar.tar.bz2 From 43d1d572b06d855198e3e143be6866a3fa6c0a6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 18 Jul 2016 02:02:19 +0100 Subject: [PATCH 63/86] Update p7zip to 16.02 and fix security issues --- .gitignore | 1 + p7zip-15.09-CVE-2015-1038.patch | 290 ------------------------------- p7zip.spec | 5 +- p7zip_15.09-no7zG_and_7zFM.patch | 15 -- sources | 2 +- 5 files changed, 6 insertions(+), 307 deletions(-) delete mode 100644 p7zip-15.09-CVE-2015-1038.patch delete mode 100644 p7zip_15.09-no7zG_and_7zFM.patch diff --git a/.gitignore b/.gitignore index 6bd4948..c004734 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /p7zip_15.09_src_all-norar.tar.bz2 /p7zip_15.14_src_all-norar.tar.bz2 /p7zip_15.14.1_src_all-norar.tar.bz2 +/p7zip_16.02_src_all-norar.tar.bz2 diff --git a/p7zip-15.09-CVE-2015-1038.patch b/p7zip-15.09-CVE-2015-1038.patch deleted file mode 100644 index 5da28c5..0000000 --- a/p7zip-15.09-CVE-2015-1038.patch +++ /dev/null @@ -1,290 +0,0 @@ -Author: Ben Hutchings -Date: Tue, 19 May 2015 02:38:40 +0100 -Description: Delay creation of symlinks to prevent arbitrary file writes (CVE-2015-1038) -Bug: http://sourceforge.net/p/p7zip/bugs/147/ -Bug-Debian: https://bugs.debian.org/774660 - -Alexander Cherepanov discovered that 7zip is susceptible to a -directory traversal vulnerability. While extracting an archive, it -will extract symlinks and then follow them if they are referenced in -further entries. This can be exploited by a rogue archive to write -files outside the current directory. - -We have to create placeholder files (which we already do) and delay -creating symlinks until the end of extraction. - -Due to the possibility of anti-items (deletions) in the archive, it is -possible for placeholders to be deleted and replaced before we create -the symlinks. It's not clear that this can be used for mischief, but -GNU tar guards against similar problems by checking that the placeholder -still exists and is the same inode. XXX It also checks 'birth time' but -this isn't portable. We can probably get away with comparing ctime -since we don't support hard links. - -diff -rup p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp ---- p7zip_15.09.orig/CPP/7zip/UI/Agent/Agent.cpp 2015-09-17 20:02:35.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/UI/Agent/Agent.cpp 2015-12-03 02:22:47.073724194 +0000 -@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const - HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(), - realIndices.Size(), testMode, extractCallback); - if (result == S_OK) -- result = extractCallbackSpec->SetDirsTimes(); -+ result = extractCallbackSpec->SetFinalAttribs(); - return result; - COM_TRY_END - } -diff -rup p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp ---- p7zip_15.09.orig/CPP/7zip/UI/Client7z/Client7z.cpp 2015-10-17 15:52:30.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/UI/Client7z/Client7z.cpp 2015-12-03 02:22:47.073724194 +0000 -@@ -230,8 +230,11 @@ private: - COutFileStream *_outFileStreamSpec; - CMyComPtr _outFileStream; - -+ CObjectVector _delayedSymLinks; -+ - public: - void Init(IInArchive *archiveHandler, const FString &directoryPath); -+ HRESULT SetFinalAttribs(); - - UInt64 NumErrors; - bool PasswordIsDefined; -@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se - } - _outFileStream.Release(); - if (_extractMode && _processedFileInfo.AttribDefined) -- SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib); -+ SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib, &_delayedSymLinks); - PrintNewLine(); - return S_OK; - } - -+HRESULT CArchiveExtractCallback::SetFinalAttribs() -+{ -+ HRESULT result = S_OK; -+ -+ for (int i = 0; i != _delayedSymLinks.Size(); ++i) -+ if (!_delayedSymLinks[i].Create()) -+ result = E_FAIL; -+ -+ _delayedSymLinks.Clear(); -+ -+ return result; -+} - - STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password) - { -@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha - // extractCallbackSpec->PasswordIsDefined = true; - // extractCallbackSpec->Password = L"1"; - HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback); -+ if (result == S_OK) -+ result = extractCallbackSpec->SetFinalAttribs(); - if (result != S_OK) - { - PrintError("Extract Error"); -diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp ---- p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 2015-10-03 09:49:15.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.cpp 2015-12-03 02:24:40.444963545 +0000 -@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se - NumFiles++; - - if (!_stdOutMode && _extractMode && _fi.AttribDefined) -- SetFileAttrib(_diskFilePath, _fi.Attrib); -+ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); - - RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted))); - -@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha - } - } - --HRESULT CArchiveExtractCallback::SetDirsTimes() -+HRESULT CArchiveExtractCallback::SetFinalAttribs() - { -+ HRESULT result = S_OK; - CRecordVector pairs; - pairs.ClearAndSetSize(_extractedFolderPaths.Size()); - unsigned i; -@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs - (WriteATime && ATimeDefined) ? &ATime : NULL, - (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL)); - } -- return S_OK; -+ -+ for (int i = 0; i != _delayedSymLinks.Size(); ++i) -+ if (!_delayedSymLinks[i].Create()) -+ result = E_FAIL; -+ -+ _delayedSymLinks.Clear(); -+ -+ return result; - } -diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.h p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.h ---- p7zip_15.09.orig/CPP/7zip/UI/Common/ArchiveExtractCallback.h 2015-10-03 11:29:09.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/UI/Common/ArchiveExtractCallback.h 2015-12-03 02:22:47.074724204 +0000 -@@ -6,6 +6,8 @@ - #include "../../../Common/MyCom.h" - #include "../../../Common/Wildcard.h" - -+#include "../../../Windows/FileDir.h" -+ - #include "../../IPassword.h" - - #include "../../Common/FileStreams.h" -@@ -237,6 +239,8 @@ class CArchiveExtractCallback: - bool _saclEnabled; - #endif - -+ CObjectVector _delayedSymLinks; -+ - void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); - HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); - HRESULT GetUnpackSize(); -@@ -330,7 +334,7 @@ public: - } - #endif - -- HRESULT SetDirsTimes(); -+ HRESULT SetFinalAttribs(); - }; - - bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item); -diff -rup p7zip_15.09.orig/CPP/7zip/UI/Common/Extract.cpp p7zip_15.09/CPP/7zip/UI/Common/Extract.cpp ---- p7zip_15.09.orig/CPP/7zip/UI/Common/Extract.cpp 2015-09-07 20:47:32.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/UI/Common/Extract.cpp 2015-12-03 02:22:47.075724215 +0000 -@@ -207,7 +207,7 @@ static HRESULT DecompressArchive( - else - result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs); - if (result == S_OK && !options.StdInMode) -- result = ecs->SetDirsTimes(); -+ result = ecs->SetFinalAttribs(); - return callback->ExtractResult(result); - } - -diff -rup p7zip_15.09.orig/CPP/Windows/FileDir.cpp p7zip_15.09/CPP/Windows/FileDir.cpp ---- p7zip_15.09.orig/CPP/Windows/FileDir.cpp 2015-10-10 13:37:41.000000000 +0100 -+++ p7zip_15.09/CPP/Windows/FileDir.cpp 2015-12-03 02:22:47.075724215 +0000 -@@ -347,7 +347,8 @@ static int convert_to_symlink(const char - return -1; - } - --bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes) -+bool SetFileAttrib(CFSTR fileName, DWORD fileAttributes, -+ CObjectVector *delayedSymLinks) - { - if (!fileName) { - SetLastError(ERROR_PATH_NOT_FOUND); -@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD - stat_info.st_mode = fileAttributes >> 16; - #ifdef ENV_HAVE_LSTAT - if (S_ISLNK(stat_info.st_mode)) { -- if ( convert_to_symlink(name) != 0) { -+ if (delayedSymLinks) -+ delayedSymLinks->Add(CDelayedSymLink(name)); -+ else if ( convert_to_symlink(name) != 0) { - TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes))) - return false; - } -@@ -814,6 +817,43 @@ bool CTempDir::Remove() - return !_mustBeDeleted; - } - -+#ifdef ENV_UNIX -+ -+CDelayedSymLink::CDelayedSymLink(const char * source) -+ : _source(source) -+{ -+ struct stat st; -+ -+ if (lstat(_source, &st) == 0) { -+ _dev = st.st_dev; -+ _ino = st.st_ino; -+ } else { -+ _dev = 0; -+ } -+} -+ -+bool CDelayedSymLink::Create() -+{ -+ struct stat st; -+ -+ if (_dev == 0) { -+ errno = EPERM; -+ return false; -+ } -+ if (lstat(_source, &st) != 0) -+ return false; -+ if (_dev != st.st_dev || _ino != st.st_ino) { -+ // Placeholder file has been overwritten or moved by another -+ // symbolic link creation -+ errno = EPERM; -+ return false; -+ } -+ -+ return convert_to_symlink(_source) == 0; -+} -+ -+#endif // ENV_UNIX -+ - }}} - - #ifndef _SFX -diff -rup p7zip_15.09.orig/CPP/Windows/FileDir.h p7zip_15.09/CPP/Windows/FileDir.h ---- p7zip_15.09.orig/CPP/Windows/FileDir.h 2015-06-19 11:52:06.000000000 +0100 -+++ p7zip_15.09/CPP/Windows/FileDir.h 2015-12-03 02:22:47.075724215 +0000 -@@ -4,6 +4,7 @@ - #define __WINDOWS_FILE_DIR_H - - #include "../Common/MyString.h" -+#include "../Common/MyVector.h" - - #include "FileIO.h" - -@@ -11,11 +12,14 @@ namespace NWindows { - namespace NFile { - namespace NDir { - -+class CDelayedSymLink; -+ - bool GetWindowsDir(FString &path); - bool GetSystemDir(FString &path); - - bool SetDirTime(CFSTR path, const FILETIME *cTime, const FILETIME *aTime, const FILETIME *mTime); --bool SetFileAttrib(CFSTR path, DWORD attrib); -+bool SetFileAttrib(CFSTR path, DWORD attrib, -+ CObjectVector *delayedSymLinks = 0); - bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); - - #ifndef UNDER_CE -@@ -76,6 +80,31 @@ public: - bool Remove(); - }; - -+// Symbolic links must be created last so that they can't be used to -+// create or overwrite files above the extraction directory. -+class CDelayedSymLink -+{ -+#ifdef ENV_UNIX -+ // Where the symlink should be created. The target is specified in -+ // the placeholder file. -+ AString _source; -+ -+ // Device and inode of the placeholder file. Before creating the -+ // symlink, we must check that these haven't been changed by creation -+ // of another symlink. -+ dev_t _dev; -+ ino_t _ino; -+ -+public: -+ explicit CDelayedSymLink(const char * source); -+ bool Create(); -+#else // !ENV_UNIX -+public: -+ CDelayedSymLink(const char * source) {} -+ bool Create() { return true; } -+#endif // ENV_UNIX -+}; -+ - #if !defined(UNDER_CE) - class CCurrentDirRestorer - { diff --git a/p7zip.spec b/p7zip.spec index 6d2c47f..22fd53a 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,6 +1,6 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 15.14.1 +Version: 16.02 Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) @@ -145,6 +145,9 @@ make test %changelog +* Mon Jul 18 2016 SĂŠrgio Basto - 16.02-1 +- Update p7zip to 16.02 and fix security issues + * Sun Mar 27 2016 SĂŠrgio Basto - 15.14.1-1 - Update to 15.14.1 - Revert 7zFM build, upstream recomends not build it diff --git a/p7zip_15.09-no7zG_and_7zFM.patch b/p7zip_15.09-no7zG_and_7zFM.patch deleted file mode 100644 index 1a3e3ba..0000000 --- a/p7zip_15.09-no7zG_and_7zFM.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt ---- p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt 2015-06-21 20:53:26.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt 2015-12-21 04:09:58.900036833 +0000 -@@ -27,9 +27,9 @@ add_subdirectory(7za) - - add_subdirectory(7z_) - --add_subdirectory(7zG) -+#add_subdirectory(7zG) - --add_subdirectory(7zFM) -+#add_subdirectory(7zFM) - - add_subdirectory(7zr) - diff --git a/sources b/sources index 1618c62..7f5670d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77def69eb3c5281702ce676e92d090f7 p7zip_15.14.1_src_all-norar.tar.bz2 +7202a0bd2aa2935576c13314783d5e1d p7zip_16.02_src_all-norar.tar.bz2 From 06b60a688dd7a2b42cdf1263e6f7ed6fb9aca1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 18 Jul 2016 10:02:05 +0100 Subject: [PATCH 64/86] Try fix build on el6 --- p7zip.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/p7zip.spec b/p7zip.spec index 22fd53a..3d4cafc 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -110,7 +110,11 @@ cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %check +%if 0%{?rhel} <= 6 +make test || : +%else make test +%endif # Next test fails, because we don't have X11 envoirment ... # Error: Unable to initialize gtk, is DISPLAY set properly? #make test_7zG || : From 4335614f76d1c9afa51d9f3d5f2af0726d3a2b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 18 Jul 2016 17:42:52 +0100 Subject: [PATCH 65/86] Second try to build on epel6 --- p7zip.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 3d4cafc..98316f4 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -110,9 +110,7 @@ cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %check -%if 0%{?rhel} <= 6 -make test || : -%else +%if 0%{?rhel} != 6 make test %endif # Next test fails, because we don't have X11 envoirment ... From 4b3973f6a5d877972c43f1bfa0093f81c8b605ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 21 Nov 2016 01:51:51 +0000 Subject: [PATCH 66/86] Update p7zip to 16.02 and fix security issues --- CVE-2016-9296.patch | 12 ++++++++++++ p7zip.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 CVE-2016-9296.patch diff --git a/CVE-2016-9296.patch b/CVE-2016-9296.patch new file mode 100644 index 0000000..773f92a --- /dev/null +++ b/CVE-2016-9296.patch @@ -0,0 +1,12 @@ +--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig 2016-11-21 01:42:29.460901230 +0000 ++++ ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +0000 +@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS + if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) + ThrowIncorrect(); + } +- HeadersSize += folders.PackPositions[folders.NumPackStreams]; ++ if (folders.PackPositions) ++ HeadersSize += folders.PackPositions[folders.NumPackStreams]; + return S_OK; + } + diff --git a/p7zip.spec b/p7zip.spec index 22fd53a..1c01f84 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -18,6 +18,7 @@ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.14-norar_cmake.patch # from Debain Patch5: 02_man.patch +Patch6: CVE-2016-9296.patch BuildRequires: cmake # for 7zG GUI @@ -61,6 +62,7 @@ rm DOC/License.txt.* %patch5 -p1 -b .man # move license files mv DOC/License.txt DOC/copying.txt . +%patch6 -p1 -b .CVE-2016-9296 # no need anymore ## And fix useless executable bit while we're at it From 6744f2a24061fcd7e2e6808e1ff0de9545c73f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 21 Nov 2016 01:58:17 +0000 Subject: [PATCH 67/86] Security fix for CVE-2016-9296 --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 1c01f84..c6b2cdb 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 1%{?dist} +Release: 2%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -147,6 +147,9 @@ make test %changelog +* Mon Nov 21 2016 SĂŠrgio Basto - 16.02-2 +- Security fix for CVE-2016-9296 + * Mon Jul 18 2016 SĂŠrgio Basto - 16.02-1 - Update p7zip to 16.02 and fix security issues From 909356d59a9a56d154aec2088228048d3123a582 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 01:09:07 +0000 Subject: [PATCH 68/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index cfd4646..20b491a 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 2%{?dist} +Release: 3%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -149,6 +149,9 @@ make test %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 16.02-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Nov 21 2016 SĂŠrgio Basto - 16.02-2 - Security fix for CVE-2016-9296 From 5867fecb97e9081ee6d1a9e9b61e4b699bab140a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 02:03:44 +0000 Subject: [PATCH 69/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 20b491a..937d90a 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 3%{?dist} +Release: 4%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -149,6 +149,9 @@ make test %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 16.02-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 16.02-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8ad2b6ffb86fff5a2164bd4c8fcf0906c429c431 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 04:44:22 +0000 Subject: [PATCH 70/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 937d90a..03575ed 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 4%{?dist} +Release: 5%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -149,6 +149,9 @@ make test %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 16.02-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 16.02-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 2b933a76f76f6de50c78da4114682e882ed3ccf6 Mon Sep 17 00:00:00 2001 From: vascom Date: Sun, 10 Sep 2017 08:29:37 +0000 Subject: [PATCH 71/86] Cleanup p7zip.spec I hope this cleanup changes can make spec file more simple and accurate with Fedora packaging guidelines. --- p7zip.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 03575ed..1229570 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,10 +1,9 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 5%{?dist} +Release: 6%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) -Group: Applications/Archiving 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 @@ -55,14 +54,11 @@ This package is *experimental*. %prep -%setup -q -n %{name}_%{version} -%patch0 -p1 -b .norar_cmake +%autosetup -p1 -n %{name}_%{version} #Remove backups from DOC directory rm DOC/License.txt.* -%patch5 -p1 -b .man # move license files mv DOC/License.txt DOC/copying.txt . -%patch6 -p1 -b .CVE-2016-9296 # no need anymore ## And fix useless executable bit while we're at it @@ -84,7 +80,7 @@ cp -f makefile.linux_amd64_asm makefile.machine cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -make %{?_smp_mflags} all2 7zG \ +%make_build all2 7zG \ OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -149,6 +145,9 @@ make test %changelog +* Sun Sep 10 2017 Vasiliy N. Glazov - 16.02-6 +- Cleanup spec + * Thu Aug 03 2017 Fedora Release Engineering - 16.02-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a9bc84b333d71a2a8ac5f4da7c480e7fda713032 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 11 Sep 2017 01:12:01 +0100 Subject: [PATCH 72/86] fix build --- p7zip.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index 1229570..cebe6d5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -55,8 +55,6 @@ This package is *experimental*. %prep %autosetup -p1 -n %{name}_%{version} -#Remove backups from DOC directory -rm DOC/License.txt.* # move license files mv DOC/License.txt DOC/copying.txt . From a3b97cf5c60577404ddc19b406d3b9c11d125134 Mon Sep 17 00:00:00 2001 From: Tomas Hoger Date: Wed, 24 Jan 2018 14:47:39 +0100 Subject: [PATCH 73/86] Add conditional for building with(out) GUI support Keep GUI enabled for Fedora and EPEL builds, but disabled for RHEL. This change also adds a missing dependency - 7zG requires 7z.so, so p7zip-gui RPM needs to require p7zip-plugins RPM. --- p7zip.spec | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index cebe6d5..2196e98 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,13 @@ +%if 0%{?rhel} && ! 0%{?epel} +%bcond_with gui +%else +%bcond_without gui +%endif + Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 6%{?dist} +Release: 7%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -20,9 +26,11 @@ Patch5: 02_man.patch Patch6: CVE-2016-9296.patch BuildRequires: cmake +%if %{with gui} # for 7zG GUI BuildRequires: wxGTK-devel BuildRequires: kde-filesystem +%endif %ifarch %{ix86} BuildRequires: nasm %endif @@ -43,14 +51,17 @@ Group: Applications/Archiving Additional plugins that can be used with 7z to extend its abilities. This package contains also a virtual file system for Midnight Commander. +%if %{with gui} %package gui Summary: 7zG - 7-Zip GUI version Requires: kde-filesystem +Requires: p7zip-plugins %description gui 7zG is a gui provide by p7zip and it is now in beta stage. Also add some context menus for KDE4. This package is *experimental*. +%endif %prep @@ -78,7 +89,10 @@ cp -f makefile.linux_amd64_asm makefile.machine cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -%make_build all2 7zG \ +%make_build all2 \ +%if %{with gui} + 7zG \ +%endif OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -98,15 +112,17 @@ make install \ mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip rmdir %{buildroot}%{_docdir}/p7zip/DOC/ +%if %{with gui} mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ # remove a duplicated of p7zip_compress.desktop rm GUI/kde4/p7zip_compress2.desktop cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ #fix non-executable-in-bin chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager +%endif %check -%if 0%{?rhel} != 6 +%if 0%{?rhel} > 6 make test %endif # Next test fails, because we don't have X11 envoirment ... @@ -134,15 +150,23 @@ make test #{_libexecdir}/p7zip/Formats/ %{_mandir}/man1/7z.1* +%if %{with gui} %files gui %{_bindir}/7zG %{_bindir}/p7zipForFilemanager %{_libexecdir}/p7zip/7zG %{_libexecdir}/p7zip/Lang %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop +%endif %changelog +* Wed Jan 24 2018 Tomas Hoger - 16.02-7 +- Add conditional for building with(out) GUI support. Keep GUI enabled for + Fedora and EPEL builds, but disabled for RHEL. +- Add missing dependency - 7zG requires 7z.so, so p7zip-gui needs to require + p7zip-plugins. + * Sun Sep 10 2017 Vasiliy N. Glazov - 16.02-6 - Cleanup spec From 6444b9ee63ef0b27d4eb77bfad186553b9fa6601 Mon Sep 17 00:00:00 2001 From: Tomas Hoger Date: Wed, 24 Jan 2018 17:52:21 +0100 Subject: [PATCH 74/86] Revert make test conditional change Previous commit incorrectly changed condition for running 'make test' from 0%{?rhel} != 6 to 0%{?rhel} > 6 with intention to make it more obvious that tests are enabled on RHEL/EPEL 7 and later, but it unintentionally disabled tests on Fedora (and possibly other distros). --- p7zip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 2196e98..fed50fc 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -122,7 +122,7 @@ chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %endif %check -%if 0%{?rhel} > 6 +%if 0%{?rhel} != 6 make test %endif # Next test fails, because we don't have X11 envoirment ... From b4ccf1ab564f81e78d5224f622a8a3e775a2b62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 24 Jan 2018 21:36:00 +0000 Subject: [PATCH 75/86] Add sub-package doc --- p7zip.spec | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index fed50fc..484a34e 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 7%{?dist} +Release: 8%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -63,18 +63,20 @@ Also add some context menus for KDE4. This package is *experimental*. %endif +%package doc +Summary: Manual documentation and contrib directory +BuildArch: noarch + +%description doc +This package contains the p7zip manual documentation and some code +contributions. %prep %autosetup -p1 -n %{name}_%{version} + # move license files mv DOC/License.txt DOC/copying.txt . -# no need anymore -## And fix useless executable bit while we're at it -#find docs -type f -exec chmod -x {} \; -#find contrib -type f -exec chmod -x {} \; - - %build pushd CPP/7zip/CMAKE/ sh ./generate.sh @@ -132,6 +134,7 @@ make test %files %{_docdir}/p7zip +%exclude %{_docdir}/p7zip/MANUAL %license copying.txt License.txt %{_bindir}/7za %dir %{_libexecdir}/p7zip/ @@ -141,7 +144,6 @@ make test %exclude %{_mandir}/man1/7zr.1* %files plugins -%doc contrib/ %{_bindir}/7z %dir %{_libexecdir}/p7zip/ %{_libexecdir}/p7zip/7z @@ -159,13 +161,21 @@ make test %{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop %endif +%files doc +%{_docdir}/p7zip/MANUAL +%doc contrib/ + %changelog +* Wed Jan 24 2018 SĂŠrgio Basto - 16.02-8 +- Add sub-package doc + * Wed Jan 24 2018 Tomas Hoger - 16.02-7 - Add conditional for building with(out) GUI support. Keep GUI enabled for Fedora and EPEL builds, but disabled for RHEL. - Add missing dependency - 7zG requires 7z.so, so p7zip-gui needs to require p7zip-plugins. +- Add sub-package doc (sergiomb) * Sun Sep 10 2017 Vasiliy N. Glazov - 16.02-6 - Cleanup spec From bf0df110f50e592528736692d3b8d16df4e96350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 25 Jan 2018 01:35:18 +0000 Subject: [PATCH 76/86] Fix typo in Changelog --- p7zip.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 484a34e..30c0358 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -175,7 +175,6 @@ make test Fedora and EPEL builds, but disabled for RHEL. - Add missing dependency - 7zG requires 7z.so, so p7zip-gui needs to require p7zip-plugins. -- Add sub-package doc (sergiomb) * Sun Sep 10 2017 Vasiliy N. Glazov - 16.02-6 - Cleanup spec From d2543d8da2dec0a587e0610c25d2a11c2876442b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 27 Jan 2018 01:16:04 +0000 Subject: [PATCH 77/86] Security fix for CVE-2017-17969 (from Debian) Add 05-hardening-flags.patch, 09-man-update.patch, 10-drop-fm-doc.patch and 14-Fix-g++-warning.patch patches from Debian, very small changes better documentation, compile flags and compile warning. --- 02_man.patch => 02-man.patch | 0 05-hardening-flags.patch | 33 ++ 09-man-update.patch | 838 +++++++++++++++++++++++++++++++++++ 10-drop-fm-doc.patch | 96 ++++ 13-CVE-2017-17969.patch | 26 ++ 14-Fix-g++-warning.patch | 24 + p7zip.spec | 17 +- 7 files changed, 1031 insertions(+), 3 deletions(-) rename 02_man.patch => 02-man.patch (100%) create mode 100644 05-hardening-flags.patch create mode 100644 09-man-update.patch create mode 100644 10-drop-fm-doc.patch create mode 100644 13-CVE-2017-17969.patch create mode 100644 14-Fix-g++-warning.patch diff --git a/02_man.patch b/02-man.patch similarity index 100% rename from 02_man.patch rename to 02-man.patch diff --git a/05-hardening-flags.patch b/05-hardening-flags.patch new file mode 100644 index 0000000..aa42431 --- /dev/null +++ b/05-hardening-flags.patch @@ -0,0 +1,33 @@ +From: Robert Luberda +Date: Fri, 22 Jan 2016 00:53:09 +0100 +Subject: Hardening flags + +Add support for $(CPPFLAGS) and do not override $(CXXFLAGS) +and $(CFLAGS) + +Bug-Debian: https://bugs.debian.org/#682167 +--- + makefile.glb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/makefile.glb b/makefile.glb +index fb001d5..e10ae03 100644 +--- a/makefile.glb ++++ b/makefile.glb +@@ -1,14 +1,14 @@ + + RM=rm -f + +-CFLAGS=-c -I. \ ++CFLAGS+=$(CPPFLAGS) -c -I. \ + -I../../../../C \ + -I../../../../CPP/myWindows \ + -I../../../../CPP/include_windows \ + -I../../../../CPP \ + $(ALLFLAGS) $(ALLFLAGS_C) + +-CXXFLAGS=-c -I. \ ++CXXFLAGS+=$(CPPFLAGS) -c -I. \ + -I../../../../C \ + -I../../../../CPP/myWindows \ + -I../../../../CPP/include_windows \ diff --git a/09-man-update.patch b/09-man-update.patch new file mode 100644 index 0000000..a200932 --- /dev/null +++ b/09-man-update.patch @@ -0,0 +1,838 @@ +From: Robert Luberda +Date: Sun, 6 Mar 2016 12:52:49 +0100 +Subject: Update man pages + +Update 7z, 7za and 7zr man pages based on the usage output printed +by the commands. + +Remove reference to -p{Password} option from the 7zr(1) page, as the +command does not support it (LP: 558609) + +Mention in 7z(1) that the 7z command might be slower than 7za (closes: #636667). + +Replace "the highest compression ratio" with "high" or "very high" +and make sure the phrase refers to the 7z format, not to the archive +program itself (closes: #636179) + +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/p7zip/+bug/558609 +Bug-Debian: https://bugs.debian.org/636179 +Bug-Debian: https://bugs.debian.org/636667 +--- + man1/7z.1 | 188 ++++++++++++++++++++++++++++++++++++++++++++--------------- + man1/7za.1 | 185 ++++++++++++++++++++++++++++++++++++++++++++-------------- + man1/7zr.1 | 192 +++++++++++++++++++++++++++++++++++++++++++++---------------- + 3 files changed, 426 insertions(+), 139 deletions(-) + +diff --git a/man1/7z.1 b/man1/7z.1 +index d2b7378..72e262b 100644 +--- a/man1/7z.1 ++++ b/man1/7z.1 +@@ -1,97 +1,187 @@ +-.TH 7z 1 "September 1 2006" "Mohammed Adnene Trojette" ++.TH 7z 1 "March 6th, 2016" "7-Zip" + .SH NAME +-7z \- A file archiver with highest compression ratio ++7z \- A file archiver with high compression ratio format + .SH SYNOPSIS + .B 7z +-.BR [adeltux] +-.BR [\-] +-.BR [SWITCH] +-.BR +-.BR ... ++.B ++.RB [ "... ]" ++.B ++.RB [ "... ]" ++.RB [ <@listfiles> "... ]" + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-.TP +-7z uses plugins to handle archives. ++7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm ++featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, ++RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++most filesystem images and DEB formats. ++Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +-.SH FUNCTION LETTERS ++.B 7z ++uses plugins to handle archives, so it might be slightly slower than ++.BR 7za (1) ++but can handle more archive formats. ++.SH COMMANDS + .TP + .B a +-Add ++Add files to archive ++.TP ++.B b ++Benchmark + .TP + .B d +-Delete ++Delete files from archive + .TP + .B e +-Extract ++Extract files from archive (without using directory names) ++.TP ++.B h ++Calculate hash values for files ++.TP ++.B i ++Show information about supported formats + .TP + .B l +-List ++List contents of archive ++.TP ++.B rn ++Rename files in archive + .TP + .B t +-Test ++Test integrity of archive + .TP + .B u +-Update ++Update files to archive + .TP + .B x +-eXtract with full paths ++eXtract files with full paths + .PP + .SH SWITCHES + .TP +-.B \-ai[r[\-|0]]{@listfile|!wildcard} ++.B \-\- ++Stop switches parsing ++.TP ++.B \-ai[r[-|0]]{@listfile|!wildcard} + Include archives + .TP +-.B \-ax[r[\-|0]]{@listfile|!wildcard} +-eXclude archives ++.B \-ax[r[-|0]]{@listfile|!wildcard} ++Exclude archives ++.TP ++.B \-ao{a|s|t|u} ++Set Overwrite mode ++.TP ++.B \-an ++Disable archive_name field ++.TP ++.B -bb[0-3] ++Set output log level + .TP + .B \-bd +-Disable percentage indicator ++Disable progress indicator ++.TP ++.B \-bs{o|e|p}{0|1|2} ++Set output stream for output/error/progress line ++.TP ++.B \-bt ++Show execution time statistics + .TP + .B \-i[r[\-|0]]{@listfile|!wildcard} + Include filenames + .TP +-.B \-l +-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') +-.TP + .B \-m{Parameters} +-Set Compression Method (see /usr/share/doc/p7zip-full/DOC/MANUAL/cmdline/switches/method.htm for a list of methods) +-.TP +-.B \-mhe=on|off +-7z format only : enables or disables archive header encryption (Default : off) ++Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP + .B \-o{Directory} + Set Output directory + .TP + .B \-p{Password} +-Set Password ++Set Password (NOTE: this flag does not work with 7zr) + .TP + .B \-r[\-|0] + Recurse subdirectories (CAUTION: this flag does not do what you think, avoid using it) + .TP ++.B \-sa{a|e|s} ++Set archive name mode ++.TP ++.B \-scc{UTF\-8|WIN|DOS} ++Set charset for for console input/output ++.TP ++.B \-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{id}} ++Set charset for list files ++.TP ++.B \-scrc[CRC32|CRC64|SHA1|SHA256|*] ++Set hash function for x, e, h commands ++.TP ++.B \-sdel ++Delete files after compression ++.TP ++.B \-seml[.] ++Send archive by email ++.TP + .B \-sfx[{name}] + Create SFX archive + .TP +-.B \-si +-Read data from StdIn (eg: tar cf \- directory | 7z a \-si directory.tar.7z) ++.B \-si[{name}] ++Read data from stdin (e.g. tar cf \- directory | 7z a \-si directory.tar.7z) + .TP +-.B \-so +-Write data to StdOut (eg: % echo foo | 7z a dummy \-tgzip \-si \-so > /dev/null) ++.B \-slp ++Set Large Pages mode + .TP + .B \-slt +-Sets technical mode for l (list) command ++Show technical information for l (List) command ++.TP ++.B \-snh ++Store hard links as links ++.TP ++.B \-snl ++Store symbolic links as links ++.TP ++.B \-sni ++Store NT security information ++.TP ++.B \-sns[\-] ++Store NTFS alternate streams ++.TP ++.B \-sfx[{name}] ++Create SFX archive ++.TP ++.B \-so ++Write data to stdout (e.g. 7z x \-so directory.tar.7z | tar xf \-) ++.TP ++.B \-spd ++Disable wildcard matching for file names ++.TP ++.B \-spe ++Eliminate duplication of root folder for extract command ++.TP ++.B \-spf ++Use fully qualified file paths ++.TP ++.B \-ssc[\-] ++Set sensitive case mode ++.TP ++.B \-ssw ++Compress shared files ++.TP ++.B \-stl ++Set archive timestamp from the most recently modified file ++.TP ++.B \-stm{HexMask} ++Set CPU thread affinity mask (hexadecimal number) ++.TP ++.B \-stx{Type} ++Exclude archive type + .TP + .B \-t{Type} +-Type of archive (7z, zip, gzip, bzip2 or tar. 7z format is default) ++Set type of archive ++.TP ++.B \-u[-][p#][q#][r#][x#][y#][z#][!newArchiveName] ++Update options + .TP + .B \-v{Size}[b|k|m|g] + Create volumes + .TP +-.B \-u[\-][p#][q#][r#][x#][y#][z#][!newArchiveName] +-Update options +-.TP + .B \-w[path] +-Set Working directory ++Set working directory. Empty path means a temporary directory + .TP + .B \-x[r[\-|0]]]{@listfile|!wildcard} + Exclude filenames +@@ -105,7 +195,8 @@ Assume Yes on all queries + .IP 0 + Normal (no errors or warnings detected) + .IP 1 +-Warning (Non fatal error(s)). For example, some files cannot be read during compressing. So they were not compressed ++Warning (Non fatal error(s)). For example, some files cannot be read during compressing, ++so they were not compressed + .IP 2 + Fatal error + .IP 7 +@@ -120,13 +211,13 @@ DO NOT USE the 7-zip format for backup purpose on Linux/Unix because : + + .LP + On Linux/Unix, in order to backup directories you must use tar : +- \- to backup a directory : tar cf \- directory | 7za a \-si directory.tar.7z +- \- to restore your backup : 7za x \-so directory.tar.7z | tar xf \- ++ \- to backup a directory : tar cf \- directory | 7z a \-si directory.tar.7z ++ \- to restore your backup : 7z x \-so directory.tar.7z | tar xf \- + + If you want to send files and directories (not the owner of file) + to others Unix/MacOS/Windows users, you can use the 7-zip format. + +- example : 7za a directory.7z directory ++ example : 7z a directory.7z directory + + .LP + Do not use "\-r" because this flag does not do what you think. +@@ -165,10 +256,15 @@ add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX arc + 7z a \-mhe=on \-pmy_password archive.7z a_directory + add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) + .SH "SEE ALSO" +-7za(1), 7zr(1), bzip2(1), gzip(1), zip(1) ++.BR 7zr (1), ++.BR 7za (1), ++.BR p7zip (1), ++.BR bzip2 (1), ++.BR gzip (1), ++.BR zip(1), + .PP + .SH "HTML Documentation" + /usr/share/doc/p7zip-full/DOC/MANUAL/start.htm + .SH AUTHOR + .TP +-Written for Debian by Mohammed Adnene Trojette. ++Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. +diff --git a/man1/7za.1 b/man1/7za.1 +index ae5730b..218e245 100644 +--- a/man1/7za.1 ++++ b/man1/7za.1 +@@ -1,99 +1,190 @@ +-.TH 7za 1 "September 1 2006" "Mohammed Adnene Trojette" ++.TH 7za 1 "March 6th, 2016" "7-Zip" + .SH NAME +-7za \- A file archiver with highest compression ratio ++7za \- A file archiver with high compression ratio format + .SH SYNOPSIS + .B 7za +-.BR [adeltux] +-.BR [-] +-.BR [SWITCH] +-.BR +-.BR ... ++.B ++.RB [ "... ]" ++.B ++.RB [ "... ]" ++.RB [ <@listfiles> "... ]" + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-.TP +-7za is a stand-alone executable. 7za handles fewer archive formats than 7z. ++7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm ++featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, ++RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++most filesystem images and DEB formats. ++Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +-.SH FUNCTION LETTERS ++.B 7za ++is a stand-alone executable. ++.B 7za ++handles fewer archive formats than ++.BR 7z (1). ++.SH COMMANDS + .TP + .B a +-Add ++Add files to archive ++.TP ++.B b ++Benchmark + .TP + .B d +-Delete ++Delete files from archive + .TP + .B e +-Extract ++Extract files from archive (without using directory names) ++.TP ++.B h ++Calculate hash values for files ++.TP ++.B i ++Show information about supported formats + .TP + .B l +-List ++List contents of archive ++.TP ++.B rn ++Rename files in archive + .TP + .B t +-Test ++Test integrity of archive + .TP + .B u +-Update ++Update files to archive + .TP + .B x +-eXtract with full paths ++eXtract files with full paths + .PP + .SH SWITCHES + .TP ++.B \-\- ++Stop switches parsing ++.TP + .B \-ai[r[-|0]]{@listfile|!wildcard} + Include archives + .TP + .B \-ax[r[-|0]]{@listfile|!wildcard} +-eXclude archives ++Exclude archives ++.TP ++.B \-ao{a|s|t|u} ++Set Overwrite mode ++.TP ++.B \-an ++Disable archive_name field ++.TP ++.B -bb[0-3] ++Set output log level + .TP + .B \-bd +-Disable percentage indicator ++Disable progress indicator + .TP +-.B \-i[r[-|0]]{@listfile|!wildcard} +-Include filenames ++.B \-bs{o|e|p}{0|1|2} ++Set output stream for output/error/progress line + .TP +-.B \-l +-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') ++.B \-bt ++Show execution time statistics + .TP +-.B \-m{Parameters} +-Set Compression Method (see /usr/share/doc/p7zip-full/DOC/MANUAL/cmdline/switches/method.htm for a list of methods) ++.B \-i[r[\-|0]]{@listfile|!wildcard} ++Include filenames + .TP +-.B \-mhe=on|off +-7z format only : enables or disables archive header encryption (Default : off) ++.B \-m{Parameters} ++Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP + .B \-o{Directory} + Set Output directory + .TP + .B \-p{Password} +-Set Password ++Set Password (NOTE: this flag does not work with 7zr) + .TP +-.B \-r[-|0] ++.B \-r[\-|0] + Recurse subdirectories (CAUTION: this flag does not do what you think, avoid using it) + .TP ++.B \-sa{a|e|s} ++Set archive name mode ++.TP ++.B \-scc{UTF\-8|WIN|DOS} ++Set charset for for console input/output ++.TP ++.B \-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{id}} ++Set charset for list files ++.TP ++.B \-scrc[CRC32|CRC64|SHA1|SHA256|*] ++Set hash function for x, e, h commands ++.TP ++.B \-sdel ++Delete files after compression ++.TP ++.B \-seml[.] ++Send archive by email ++.TP + .B \-sfx[{name}] + Create SFX archive + .TP +-.B \-si +-Read data from StdIn (eg: tar cf \- directory | 7za a \-si directory.tar.7z) ++.B \-si[{name}] ++Read data from stdin (e.g. tar cf \- directory | 7za a \-si directory.tar.7z) + .TP +-.B \-so +-Write data to StdOut (eg: % echo foo | 7z a dummy \-tgzip \-si \-so > /dev/null) ++.B \-slp ++Set Large Pages mode + .TP + .B \-slt +-Sets technical mode for l (list) command ++Show technical information for l (List) command + .TP +-.B \-t{Type} +-Type of archive (7z, zip, gzip, bzip2 or tar. 7z format is default) ++.B \-snh ++Store hard links as links + .TP +-.B \-v{Size}[b|k|m|g] +-Create volumes ++.B \-snl ++Store symbolic links as links ++.TP ++.B \-sni ++Store NT security information ++.TP ++.B \-sns[\-] ++Store NTFS alternate streams ++.TP ++.B \-sfx[{name}] ++Create SFX archive ++.TP ++.B \-so ++Write data to stdout (e.g. 7za x \-so directory.tar.7z | tar xf \-) ++.TP ++.B \-spd ++Disable wildcard matching for file names ++.TP ++.B \-spe ++Eliminate duplication of root folder for extract command ++.TP ++.B \-spf ++Use fully qualified file paths ++.TP ++.B \-ssc[\-] ++Set sensitive case mode ++.TP ++.B \-ssw ++Compress shared files ++.TP ++.B \-stl ++Set archive timestamp from the most recently modified file ++.TP ++.B \-stm{HexMask} ++Set CPU thread affinity mask (hexadecimal number) ++.TP ++.B \-stx{Type} ++Exclude archive type ++.TP ++.B \-t{Type} ++Set type of archive + .TP + .B \-u[-][p#][q#][r#][x#][y#][z#][!newArchiveName] + Update options + .TP ++.B \-v{Size}[b|k|m|g] ++Create volumes ++.TP + .B \-w[path] +-Set Working directory ++Set working directory. Empty path means a temporary directory + .TP +-.B \-x[r[-|0]]]{@listfile|!wildcard} ++.B \-x[r[\-|0]]]{@listfile|!wildcard} + Exclude filenames + .TP + .B \-y +@@ -105,7 +196,8 @@ Assume Yes on all queries + .IP 0 + Normal (no errors or warnings detected) + .IP 1 +-Warning (Non fatal error(s)). For example, some files cannot be read during compressing. So they were not compressed ++Warning (Non fatal error(s)). For example, some files cannot be read during compressing, ++so they were not compressed + .IP 2 + Fatal error + .IP 7 +@@ -165,10 +257,15 @@ add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX arc + 7za a \-mhe=on \-pmy_password archive.7z a_directory + add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) + .SH "SEE ALSO" +-7z(1), 7zr(1), bzip2(1), gzip(1), zip(1) ++.BR 7zr (1), ++.BR 7z (1), ++.BR p7zip (1), ++.BR bzip2 (1), ++.BR gzip (1), ++.BR zip(1), + .PP + .SH "HTML Documentation" + /usr/share/doc/p7zip-full/DOC/MANUAL/start.htm + .SH AUTHOR + .TP +-Written for Debian by Mohammed Adnene Trojette. ++Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. +diff --git a/man1/7zr.1 b/man1/7zr.1 +index fb2dcfd..494efc9 100644 +--- a/man1/7zr.1 ++++ b/man1/7zr.1 +@@ -1,99 +1,192 @@ +-.TH 7zr 1 "September 1 2006" "Mohammed Adnene Trojette" ++.TH 7zr 1 "March 6th, 2016" "7-Zip" + .SH NAME +-7zr \- A file archiver with highest compression ratio ++7zr \- A file archiver with high compression ratio format + .SH SYNOPSIS + .B 7zr +-.BR [adeltux] +-.BR [-] +-.BR [SWITCH] +-.BR +-.BR ... ++.B ++.RB [ "... ]" ++.B ++.RB [ "... ]" ++.RB [ <@listfiles> "... ]" + .PP + .SH DESCRIPTION +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-.TP +-7zr is a stand-alone executable. 7zr handles fewer archive formats than 7z. 7zr is a "light-version" of 7za that only handles 7z archives. ++7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm ++featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, ++RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++most filesystem images and DEB formats. ++Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. + .PP +-.SH FUNCTION LETTERS ++.B 7zr ++is a stand-alone executable. ++.B 7zr ++is a "light-version" of ++.BR 7za (1). ++.B 7zr ++handles password-less archives in the 7z, LZMA2, and XZ formats only. ++.SH COMMANDS + .TP + .B a +-Add ++Add files to archive ++.TP ++.B b ++Benchmark + .TP + .B d +-Delete ++Delete files from archive + .TP + .B e +-Extract ++Extract files from archive (without using directory names) ++.TP ++.B h ++Calculate hash values for files ++.TP ++.B i ++Show information about supported formats + .TP + .B l +-List ++List contents of archive ++.TP ++.B rn ++Rename files in archive + .TP + .B t +-Test ++Test integrity of archive + .TP + .B u +-Update ++Update files to archive + .TP + .B x +-eXtract with full paths ++eXtract files with full paths + .PP + .SH SWITCHES + .TP ++.B \-\- ++Stop switches parsing ++.TP + .B \-ai[r[-|0]]{@listfile|!wildcard} + Include archives + .TP + .B \-ax[r[-|0]]{@listfile|!wildcard} +-eXclude archives ++Exclude archives ++.TP ++.B \-ao{a|s|t|u} ++Set Overwrite mode ++.TP ++.B \-an ++Disable archive_name field ++.TP ++.B -bb[0-3] ++Set output log level + .TP + .B \-bd +-Disable percentage indicator ++Disable progress indicator + .TP +-.B \-i[r[-|0]]{@listfile|!wildcard} +-Include filenames ++.B \-bs{o|e|p}{0|1|2} ++Set output stream for output/error/progress line ++.TP ++.B \-bt ++Show execution time statistics + .TP +-.B \-l +-don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') ++.B \-i[r[\-|0]]{@listfile|!wildcard} ++Include filenames + .TP + .B \-m{Parameters} + Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP +-.B \-mhe=on|off +-7z format only : enables or disables archive header encryption (Default : off) +-.TP + .B \-o{Directory} + Set Output directory + .TP +-.B \-p{Password} +-Set Password +-.TP +-.B \-r[-|0] ++.B \-r[\-|0] + Recurse subdirectories (CAUTION: this flag does not do what you think, avoid using it) + .TP ++.B \-sa{a|e|s} ++Set archive name mode ++.TP ++.B \-scc{UTF\-8|WIN|DOS} ++Set charset for for console input/output ++.TP ++.B \-scs{UTF\-8|UTF\-16LE|UTF\-16BE|WIN|DOS|{id}} ++Set charset for list files ++.TP ++.B \-scrc[CRC32|CRC64|SHA1|SHA256|*] ++Set hash function for x, e, h commands ++.TP ++.B \-sdel ++Delete files after compression ++.TP ++.B \-seml[.] ++Send archive by email ++.TP + .B \-sfx[{name}] + Create SFX archive + .TP +-.B \-si +-Read data from StdIn (eg: tar cf \- directory | 7zr a \-si directory.tar.7z) ++.B \-si[{name}] ++Read data from stdin (e.g. tar cf \- directory | 7zr a \-si directory.tar.7z) + .TP +-.B \-so +-Write data to StdOut (eg: 7zr x \-so directory.tar.7z | tar xf \-) ++.B \-slp ++Set Large Pages mode + .TP + .B \-slt +-Sets technical mode for l (list) command ++Show technical information for l (List) command + .TP +-.B \-v{Size}[b|k|m|g] +-Create volumes ++.B \-snh ++Store hard links as links ++.TP ++.B \-snl ++Store symbolic links as links ++.TP ++.B \-sni ++Store NT security information ++.TP ++.B \-sns[\-] ++Store NTFS alternate streams ++.TP ++.B \-sfx[{name}] ++Create SFX archive ++.TP ++.B \-so ++Write data to stdout (e.g. 7zr x \-so directory.tar.7z | tar xf \-) ++.TP ++.B \-spd ++Disable wildcard matching for file names ++.TP ++.B \-spe ++Eliminate duplication of root folder for extract command ++.TP ++.B \-spf ++Use fully qualified file paths ++.TP ++.B \-ssc[\-] ++Set sensitive case mode ++.TP ++.B \-ssw ++Compress shared files ++.TP ++.B \-stl ++Set archive timestamp from the most recently modified file ++.TP ++.B \-stm{HexMask} ++Set CPU thread affinity mask (hexadecimal number) ++.TP ++.B \-stx{Type} ++Exclude archive type ++.TP ++.B \-t{Type} ++Set type of archive + .TP + .B \-u[-][p#][q#][r#][x#][y#][z#][!newArchiveName] + Update options + .TP ++.B \-v{Size}[b|k|m|g] ++Create volumes ++.TP + .B \-w[path] +-Set Working directory ++Set working directory. Empty path means a temporary directory + .TP +-.B \-x[r[-|0]]]{@listfile|!wildcard} ++.B \-x[r[\-|0]]]{@listfile|!wildcard} + Exclude filenames + .TP +-.B \-y ++.B \-y + Assume Yes on all queries + .PP + .SH DIAGNOSTICS +@@ -102,7 +195,8 @@ Assume Yes on all queries + .IP 0 + Normal (no errors or warnings detected) + .IP 1 +-Warning (Non fatal error(s)). For example, some files cannot be read during compressing. So they were not compressed ++Warning (Non fatal error(s)). For example, some files cannot be read during compressing, ++so they were not compressed + .IP 2 + Fatal error + .IP 7 +@@ -156,16 +250,16 @@ solid archive = on + .B + 7zr a \-sfx archive.exe dir1 + add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX archive MUST end with ".exe") +-.SH EXAMPLE 3 +-.TP +-.B +-7zr a \-mhe=on \-pmy_password archive.7z a_directory +-add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) + .SH "SEE ALSO" +-7z(1), 7za(1), bzip2(1), gzip(1), zip(1) ++.BR 7za (1), ++.BR 7z (1), ++.BR p7zip (1), ++.BR bzip2 (1), ++.BR gzip (1), ++.BR zip(1), + .PP + .SH "HTML Documentation" + /usr/share/doc/p7zip/DOC/MANUAL/start.htm (avabilable when the p7zip-full package is installed) + .SH AUTHOR + .TP +-Written for Debian by Mohammed Adnene Trojette. ++Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. diff --git a/10-drop-fm-doc.patch b/10-drop-fm-doc.patch new file mode 100644 index 0000000..aadf9cb --- /dev/null +++ b/10-drop-fm-doc.patch @@ -0,0 +1,96 @@ +From: Robert Luberda +Date: Sun, 6 Mar 2016 13:16:16 +0100 +Subject: Remove references to fm/ dir and license.htm + +Remove references to fm/* which describes Windows GUI, which +is not available in this package. + +Replace references to license.htm with references to copyright. + +Drop .exe extension from 7z commands (LP: #181402). + +Bugs-Ubuntu https://bugs.launchpad.net/ubuntu/+source/p7zip/+bug/181402 +--- + DOC/MANUAL/cmdline/index.htm | 10 +++++----- + DOC/MANUAL/cmdline/switches/sfx.htm | 2 +- + DOC/MANUAL/general/index.htm | 3 +-- + DOC/MANUAL/start.htm | 3 +-- + 4 files changed, 8 insertions(+), 10 deletions(-) + +diff --git a/DOC/MANUAL/cmdline/index.htm b/DOC/MANUAL/cmdline/index.htm +index c3515a3..129c479 100644 +--- a/DOC/MANUAL/cmdline/index.htm ++++ b/DOC/MANUAL/cmdline/index.htm +@@ -11,12 +11,12 @@ +

Command Line Version User's Guide

+ + +-

7z.exe is the command line version of 7-Zip. 7z.exe uses 7z.dll +-from the 7-Zip package. 7z.dll is used by the 7-Zip File Manager also. ++

7z is the command line version of 7-Zip. 7z uses 7z.so ++from the 7-Zip package. + +-

7za.exe (a = alone) is a standalone version of 7-Zip. +-7za.exe supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. +-7za.exe doesn't use external modules. ++

7za (a = alone) is a standalone version of 7-Zip. ++7za supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. ++7za doesn't use external modules. + +

    +
  • Command Line syntax
    • +diff --git a/DOC/MANUAL/cmdline/switches/sfx.htm b/DOC/MANUAL/cmdline/switches/sfx.htm +index bed2f33..e93a284 100644 +--- a/DOC/MANUAL/cmdline/switches/sfx.htm ++++ b/DOC/MANUAL/cmdline/switches/sfx.htm +@@ -22,7 +22,7 @@ +
    {SFX_Module}
    +
    +

    Specifies the SFX module that will be combined with the archive. +- This module must be placed in the same directory as the 7z.exe. ++ This module must be placed in the same directory as the 7z. + If {SFX_Module} is not assigned, 7-Zip will use standard console + SFX module 7zCon.sfx.

    + +diff --git a/DOC/MANUAL/general/index.htm b/DOC/MANUAL/general/index.htm +index 2e304a4..4c5e55a 100644 +--- a/DOC/MANUAL/general/index.htm ++++ b/DOC/MANUAL/general/index.htm +@@ -13,7 +13,6 @@ +

    The main features of 7-Zip

    + +
      +-
    • Powerful file manager
      • +
    • High compression ratio and high speed
      • +
    • Big number of supported archive formats
      • +
    • Additional command line version
      • +@@ -21,7 +20,7 @@ + +

      See Also

      + + + +diff --git a/DOC/MANUAL/start.htm b/DOC/MANUAL/start.htm +index e4f96b4..e767c49 100644 +--- a/DOC/MANUAL/start.htm ++++ b/DOC/MANUAL/start.htm +@@ -17,7 +17,6 @@ + + + +@@ -25,7 +24,7 @@ + + + +
      diff --git a/13-CVE-2017-17969.patch b/13-CVE-2017-17969.patch new file mode 100644 index 0000000..9a820af --- /dev/null +++ b/13-CVE-2017-17969.patch @@ -0,0 +1,26 @@ +From: =?utf-8?q?Antoine_Beaupr=C3=A9?= +Date: Sun, 28 Jan 2018 21:19:50 +0100 +Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta + +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp +index 80b7e67..4acdce5 100644 +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; +- } ++ if (i >= kNumItems) ++ break; ++ } ++ ++ if (i >= kNumItems) ++ break; + + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; diff --git a/14-Fix-g++-warning.patch b/14-Fix-g++-warning.patch new file mode 100644 index 0000000..226e239 --- /dev/null +++ b/14-Fix-g++-warning.patch @@ -0,0 +1,24 @@ +From: Robert Luberda +Date: Sun, 28 Jan 2018 22:19:13 +0100 +Subject: Fix g++ warning + +Fix for "use of an operand of type 'bool' in 'operator++' +is deprecated [-Wdeprecated]" warning taken from 7zip 18.00.beta +package. +--- + CPP/7zip/Archive/Wim/WimHandler.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp +index 27d3298..4ff5cfe 100644 +--- a/CPP/7zip/Archive/Wim/WimHandler.cpp ++++ b/CPP/7zip/Archive/Wim/WimHandler.cpp +@@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value) + + AString res; + +- bool numMethods = 0; ++ unsigned numMethods = 0; + for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) + { + if (methodMask & ((UInt32)1 << i)) diff --git a/p7zip.spec b/p7zip.spec index 30c0358..902ab8e 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 8%{?dist} +Release: 9%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -22,8 +22,13 @@ URL: http://p7zip.sourceforge.net/ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.14-norar_cmake.patch # from Debain -Patch5: 02_man.patch +Patch5: 02-man.patch Patch6: CVE-2016-9296.patch +Patch7: 05-hardening-flags.patch +Patch8: 09-man-update.patch +Patch9: 10-drop-fm-doc.patch +Patch10: 13-CVE-2017-17969.patch +Patch11: 14-Fix-g++-warning.patch BuildRequires: cmake %if %{with gui} @@ -124,7 +129,7 @@ chmod +x %{buildroot}%{_bindir}/p7zipForFilemanager %endif %check -%if 0%{?rhel} != 6 +%if ! 0%{?rhel} || 0%{?rhel} >= 7 make test %endif # Next test fails, because we don't have X11 envoirment ... @@ -167,6 +172,12 @@ make test %changelog +* Sat Jan 27 2018 SĂŠrgio Basto - 16.02-9 +- Security fix for CVE-2017-17969 (from Debian) +- Add 05-hardening-flags.patch, 09-man-update.patch, 10-drop-fm-doc.patch + and 14-Fix-g++-warning.patch patches from Debian, very small changes + better documentation, compile flags and compile warning. + * Wed Jan 24 2018 SĂŠrgio Basto - 16.02-8 - Add sub-package doc From 178154db11fa6dd8e3d95a7988715da286c1c096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 4 Feb 2018 04:02:09 +0000 Subject: [PATCH 78/86] Redo some patches --- 02-man.patch | 43 ++--- 10-drop-fm-doc.patch | 96 ----------- 09-man-update.patch => p7zip-manpages.patch | 175 +++++++++++++------- p7zip.spec | 3 +- 4 files changed, 137 insertions(+), 180 deletions(-) delete mode 100644 10-drop-fm-doc.patch rename 09-man-update.patch => p7zip-manpages.patch (74%) diff --git a/02-man.patch b/02-man.patch index aa348a4..909a44e 100644 --- a/02-man.patch +++ b/02-man.patch @@ -1,29 +1,22 @@ -Index: p7zip-9.20.1~dfsg.1/man1/7z.1 -=================================================================== ---- p7zip-9.20.1~dfsg.1.orig/man1/7z.1 2011-08-03 12:39:44.000000000 +0200 -+++ p7zip-9.20.1~dfsg.1/man1/7z.1 2011-08-03 12:39:51.000000000 +0200 -@@ -10,7 +10,7 @@ - .BR ... - .PP +--- p7zip_16.02/man1/7z.1.orig 2018-02-04 03:47:31.934553305 +0000 ++++ p7zip_16.02/man1/7z.1 2018-02-04 03:54:22.504752021 +0000 +@@ -12,7 +12,7 @@ .SH DESCRIPTION --7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -+7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. - .TP - 7z uses plugins to handle archives. - .PP -Index: p7zip-9.20.1~dfsg.1/man1/7za.1 -=================================================================== ---- p7zip-9.20.1~dfsg.1.orig/man1/7za.1 2011-08-03 12:39:45.000000000 +0200 -+++ p7zip-9.20.1~dfsg.1/man1/7za.1 2011-08-03 12:40:25.000000000 +0200 -@@ -10,9 +10,9 @@ - .BR ... + 7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm + featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +-RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++RAR (it was removed due a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, + most filesystem images and DEB formats. + Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. .PP +--- p7zip_16.02/man1/7za.1.orig 2018-02-04 03:53:54.243463005 +0000 ++++ p7zip_16.02/man1/7za.1 2018-02-04 03:55:12.645264785 +0000 +@@ -12,7 +12,7 @@ .SH DESCRIPTION --7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -+7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (it was removed due to a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. - .TP --7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others. -+7za is a stand-alone executable. 7za handles less archive formats than 7z. + 7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm + featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +-RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, ++RAR (it was removed due a non-free license), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, + most filesystem images and DEB formats. + Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. .PP - .SH FUNCTION LETTERS - .TP diff --git a/10-drop-fm-doc.patch b/10-drop-fm-doc.patch deleted file mode 100644 index aadf9cb..0000000 --- a/10-drop-fm-doc.patch +++ /dev/null @@ -1,96 +0,0 @@ -From: Robert Luberda -Date: Sun, 6 Mar 2016 13:16:16 +0100 -Subject: Remove references to fm/ dir and license.htm - -Remove references to fm/* which describes Windows GUI, which -is not available in this package. - -Replace references to license.htm with references to copyright. - -Drop .exe extension from 7z commands (LP: #181402). - -Bugs-Ubuntu https://bugs.launchpad.net/ubuntu/+source/p7zip/+bug/181402 ---- - DOC/MANUAL/cmdline/index.htm | 10 +++++----- - DOC/MANUAL/cmdline/switches/sfx.htm | 2 +- - DOC/MANUAL/general/index.htm | 3 +-- - DOC/MANUAL/start.htm | 3 +-- - 4 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/DOC/MANUAL/cmdline/index.htm b/DOC/MANUAL/cmdline/index.htm -index c3515a3..129c479 100644 ---- a/DOC/MANUAL/cmdline/index.htm -+++ b/DOC/MANUAL/cmdline/index.htm -@@ -11,12 +11,12 @@ -

      Command Line Version User's Guide

      - - --

      7z.exe is the command line version of 7-Zip. 7z.exe uses 7z.dll --from the 7-Zip package. 7z.dll is used by the 7-Zip File Manager also. -+

      7z is the command line version of 7-Zip. 7z uses 7z.so -+from the 7-Zip package. - --

      7za.exe (a = alone) is a standalone version of 7-Zip. --7za.exe supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. --7za.exe doesn't use external modules. -+

      7za (a = alone) is a standalone version of 7-Zip. -+7za supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. -+7za doesn't use external modules. - -

        -
      • Command Line syntax
        • -diff --git a/DOC/MANUAL/cmdline/switches/sfx.htm b/DOC/MANUAL/cmdline/switches/sfx.htm -index bed2f33..e93a284 100644 ---- a/DOC/MANUAL/cmdline/switches/sfx.htm -+++ b/DOC/MANUAL/cmdline/switches/sfx.htm -@@ -22,7 +22,7 @@ -
        {SFX_Module}
        -
        -

        Specifies the SFX module that will be combined with the archive. -- This module must be placed in the same directory as the 7z.exe. -+ This module must be placed in the same directory as the 7z. - If {SFX_Module} is not assigned, 7-Zip will use standard console - SFX module 7zCon.sfx.

        -
    -diff --git a/DOC/MANUAL/general/index.htm b/DOC/MANUAL/general/index.htm -index 2e304a4..4c5e55a 100644 ---- a/DOC/MANUAL/general/index.htm -+++ b/DOC/MANUAL/general/index.htm -@@ -13,7 +13,6 @@ -

    The main features of 7-Zip

    - -
      --
    • Powerful file manager
      • -
    • High compression ratio and high speed
      • -
    • Big number of supported archive formats
      • -
    • Additional command line version
      • -@@ -21,7 +20,7 @@ - -

      See Also

      - - - -diff --git a/DOC/MANUAL/start.htm b/DOC/MANUAL/start.htm -index e4f96b4..e767c49 100644 ---- a/DOC/MANUAL/start.htm -+++ b/DOC/MANUAL/start.htm -@@ -17,7 +17,6 @@ - - - -@@ -25,7 +24,7 @@ - - - -
      diff --git a/09-man-update.patch b/p7zip-manpages.patch similarity index 74% rename from 09-man-update.patch rename to p7zip-manpages.patch index a200932..8dc4df4 100644 --- a/09-man-update.patch +++ b/p7zip-manpages.patch @@ -1,32 +1,80 @@ -From: Robert Luberda -Date: Sun, 6 Mar 2016 12:52:49 +0100 -Subject: Update man pages - -Update 7z, 7za and 7zr man pages based on the usage output printed -by the commands. - -Remove reference to -p{Password} option from the 7zr(1) page, as the -command does not support it (LP: 558609) - -Mention in 7z(1) that the 7z command might be slower than 7za (closes: #636667). - -Replace "the highest compression ratio" with "high" or "very high" -and make sure the phrase refers to the 7z format, not to the archive -program itself (closes: #636179) - -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/p7zip/+bug/558609 -Bug-Debian: https://bugs.debian.org/636179 -Bug-Debian: https://bugs.debian.org/636667 ---- - man1/7z.1 | 188 ++++++++++++++++++++++++++++++++++++++++++++--------------- - man1/7za.1 | 185 ++++++++++++++++++++++++++++++++++++++++++++-------------- - man1/7zr.1 | 192 +++++++++++++++++++++++++++++++++++++++++++++---------------- - 3 files changed, 426 insertions(+), 139 deletions(-) - -diff --git a/man1/7z.1 b/man1/7z.1 -index d2b7378..72e262b 100644 ---- a/man1/7z.1 -+++ b/man1/7z.1 +Join of 02-man.patch, 09-man-update.patch and 10-drop-fm-doc.patch from Debian +diff -rup p7zip_16.02.orig/DOC/MANUAL/cmdline/index.htm p7zip_16.02/DOC/MANUAL/cmdline/index.htm +--- p7zip_16.02.orig/DOC/MANUAL/cmdline/index.htm 2016-05-10 10:50:08.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/cmdline/index.htm 2018-02-04 03:32:41.200460969 +0000 +@@ -11,12 +11,12 @@ +

      Command Line Version User's Guide

      + + +-

      7z.exe is the command line version of 7-Zip. 7z.exe uses 7z.dll +-from the 7-Zip package. 7z.dll is used by the 7-Zip File Manager also. ++

      7z is the command line version of 7-Zip. 7z uses 7z.so ++from the 7-Zip package. + +-

      7za.exe (a = alone) is a standalone version of 7-Zip. +-7za.exe supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. +-7za.exe doesn't use external modules. ++

      7za (a = alone) is a standalone version of 7-Zip. ++7za supports only 7z, lzma, cab, zip, gzip, bzip2, Z and tar formats. ++7za doesn't use external modules. + +

        +
      • Command Line syntax
        • +diff -rup p7zip_16.02.orig/DOC/MANUAL/cmdline/switches/sfx.htm p7zip_16.02/DOC/MANUAL/cmdline/switches/sfx.htm +--- p7zip_16.02.orig/DOC/MANUAL/cmdline/switches/sfx.htm 2016-05-10 10:50:08.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/cmdline/switches/sfx.htm 2018-02-04 03:32:41.200460969 +0000 +@@ -22,7 +22,7 @@ +
        {SFX_Module}
        +
        +

        Specifies the SFX module that will be combined with the archive. +- This module must be placed in the same directory as the 7z.exe. ++ This module must be placed in the same directory as the 7z. + If {SFX_Module} is not assigned, 7-Zip will use standard console + SFX module 7zCon.sfx.

        +
    +diff -rup p7zip_16.02.orig/DOC/MANUAL/general/index.htm p7zip_16.02/DOC/MANUAL/general/index.htm +--- p7zip_16.02.orig/DOC/MANUAL/general/index.htm 2016-05-10 10:50:08.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/general/index.htm 2018-02-04 03:32:41.200460969 +0000 +@@ -13,7 +13,6 @@ +

    The main features of 7-Zip

    + +
      +-
    • Powerful file manager
      • +
    • High compression ratio and high speed
      • +
    • Big number of supported archive formats
      • +
    • Additional command line version
      • +@@ -21,7 +20,7 @@ + +

      See Also

      + + + +diff -rup p7zip_16.02.orig/DOC/MANUAL/start.htm p7zip_16.02/DOC/MANUAL/start.htm +--- p7zip_16.02.orig/DOC/MANUAL/start.htm 2016-05-21 09:53:28.000000000 +0100 ++++ p7zip_16.02/DOC/MANUAL/start.htm 2018-02-04 03:32:41.201460979 +0000 +@@ -17,7 +17,6 @@ + + + +@@ -25,7 +24,7 @@ + + + +
      +diff -rup p7zip_16.02.orig/man1/7z.1 p7zip_16.02/man1/7z.1 +--- p7zip_16.02.orig/man1/7z.1 2007-09-21 19:53:12.000000000 +0100 ++++ p7zip_16.02/man1/7z.1 2018-02-04 03:33:07.305726696 +0000 @@ -1,97 +1,187 @@ -.TH 7z 1 "September 1 2006" "Mohammed Adnene Trojette" +.TH 7z 1 "March 6th, 2016" "7-Zip" @@ -47,7 +95,7 @@ index d2b7378..72e262b 100644 +.RB [ <@listfiles> "... ]" .PP .SH DESCRIPTION --7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -.TP -7z uses plugins to handle archives. +7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm @@ -143,7 +191,7 @@ index d2b7378..72e262b 100644 -don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') -.TP .B \-m{Parameters} --Set Compression Method (see /usr/share/doc/p7zip-full/DOC/MANUAL/cmdline/switches/method.htm for a list of methods) +-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods) -.TP -.B \-mhe=on|off -7z format only : enables or disables archive header encryption (Default : off) @@ -265,7 +313,7 @@ index d2b7378..72e262b 100644 .IP 2 Fatal error .IP 7 -@@ -120,13 +211,13 @@ DO NOT USE the 7-zip format for backup purpose on Linux/Unix because : +@@ -120,13 +211,13 @@ DO NOT USE the 7-zip format for backup p .LP On Linux/Unix, in order to backup directories you must use tar : @@ -282,7 +330,7 @@ index d2b7378..72e262b 100644 .LP Do not use "\-r" because this flag does not do what you think. -@@ -165,10 +256,15 @@ add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX arc +@@ -165,10 +256,15 @@ add all files from directory "dir1" to S 7z a \-mhe=on \-pmy_password archive.7z a_directory add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) .SH "SEE ALSO" @@ -295,15 +343,15 @@ index d2b7378..72e262b 100644 +.BR zip(1), .PP .SH "HTML Documentation" - /usr/share/doc/p7zip-full/DOC/MANUAL/start.htm +-{DEST_SHARE_DOC}/MANUAL/index.htm ++/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm .SH AUTHOR .TP -Written for Debian by Mohammed Adnene Trojette. +Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. -diff --git a/man1/7za.1 b/man1/7za.1 -index ae5730b..218e245 100644 ---- a/man1/7za.1 -+++ b/man1/7za.1 +diff -rup p7zip_16.02.orig/man1/7za.1 p7zip_16.02/man1/7za.1 +--- p7zip_16.02.orig/man1/7za.1 2007-09-21 19:53:24.000000000 +0100 ++++ p7zip_16.02/man1/7za.1 2018-02-04 03:33:07.305726696 +0000 @@ -1,99 +1,190 @@ -.TH 7za 1 "September 1 2006" "Mohammed Adnene Trojette" +.TH 7za 1 "March 6th, 2016" "7-Zip" @@ -324,9 +372,9 @@ index ae5730b..218e245 100644 +.RB [ <@listfiles> "... ]" .PP .SH DESCRIPTION --7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -.TP --7za is a stand-alone executable. 7za handles fewer archive formats than 7z. +-7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others. +7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm +featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, @@ -417,7 +465,7 @@ index ae5730b..218e245 100644 +Show execution time statistics .TP -.B \-m{Parameters} --Set Compression Method (see /usr/share/doc/p7zip-full/DOC/MANUAL/cmdline/switches/method.htm for a list of methods) +-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods) +.B \-i[r[\-|0]]{@listfile|!wildcard} +Include filenames .TP @@ -546,7 +594,7 @@ index ae5730b..218e245 100644 .IP 2 Fatal error .IP 7 -@@ -165,10 +257,15 @@ add all files from directory "dir1" to SFX archive archive.exe (Remark : SFX arc +@@ -165,10 +257,15 @@ add all files from directory "dir1" to S 7za a \-mhe=on \-pmy_password archive.7z a_directory add all files from directory "a_directory" to the archive "archive.7z" (with data and header archive encryption on) .SH "SEE ALSO" @@ -559,15 +607,15 @@ index ae5730b..218e245 100644 +.BR zip(1), .PP .SH "HTML Documentation" - /usr/share/doc/p7zip-full/DOC/MANUAL/start.htm +-{DEST_SHARE_DOC}/MANUAL/index.htm ++/usr/share/doc/p7zip-full/DOC/MANUAL/start.htm .SH AUTHOR .TP -Written for Debian by Mohammed Adnene Trojette. +Written for Debian by Mohammed Adnene Trojette. Updated by Robert Luberda. -diff --git a/man1/7zr.1 b/man1/7zr.1 -index fb2dcfd..494efc9 100644 ---- a/man1/7zr.1 -+++ b/man1/7zr.1 +diff -rup p7zip_16.02.orig/man1/7zr.1 p7zip_16.02/man1/7zr.1 +--- p7zip_16.02.orig/man1/7zr.1 2007-09-21 19:53:34.000000000 +0100 ++++ p7zip_16.02/man1/7zr.1 2018-02-04 03:33:07.305726696 +0000 @@ -1,99 +1,192 @@ -.TH 7zr 1 "September 1 2006" "Mohammed Adnene Trojette" +.TH 7zr 1 "March 6th, 2016" "7-Zip" @@ -588,9 +636,9 @@ index fb2dcfd..494efc9 100644 +.RB [ <@listfiles> "... ]" .PP .SH DESCRIPTION --7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), LZMA2, XZ, ZIP, Zip64, CAB, RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, most filesystem images and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. +-7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format. -.TP --7zr is a stand-alone executable. 7zr handles fewer archive formats than 7z. 7zr is a "light-version" of 7za that only handles 7z archives. +-7zr is a stand-alone executable. 7zr handles less archive formats than 7z, but does not need any others. 7zr is a "light-version" of 7za that only handles 7z archives. +7-Zip is a file archiver supporting 7z (that implements LZMA compression algorithm +featuring very high compression ratio), LZMA2, XZ, ZIP, Zip64, CAB, +RAR (if the non-free p7zip-rar package is installed), ARJ, GZIP, BZIP2, TAR, CPIO, RPM, ISO, @@ -676,21 +724,22 @@ index fb2dcfd..494efc9 100644 -Include filenames +.B \-bs{o|e|p}{0|1|2} +Set output stream for output/error/progress line -+.TP -+.B \-bt -+Show execution time statistics .TP -.B \-l -don't store symlinks; store the files/directories they point to (CAUTION : the scanning stage can never end because of recursive symlinks like 'ln \-s .. ldir') ++.B \-bt ++Show execution time statistics + .TP +-.B \-m{Parameters} +-Set Compression Method (see {DEST_SHARE_DOC}/MANUAL/switches/method.htm for a list of methods) +.B \-i[r[\-|0]]{@listfile|!wildcard} +Include filenames .TP - .B \-m{Parameters} - Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) - .TP -.B \-mhe=on|off -7z format only : enables or disables archive header encryption (Default : off) --.TP ++.B \-m{Parameters} ++Set Compression Method (see /usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm from the p7zip-full package for a list of methods) + .TP .B \-o{Directory} Set Output directory .TP @@ -812,6 +861,17 @@ index fb2dcfd..494efc9 100644 .IP 2 Fatal error .IP 7 +@@ -117,8 +211,8 @@ DO NOT USE the 7-zip format for backup p + + .LP + On Linux/Unix, in order to backup directories you must use tar : +- \- to backup a directory : tar cf - directory | 7zr a -si directory.tar.7z +- \- to restore your backup : 7zr x -so directory.tar.7z | tar xf - ++ \- to backup a directory : tar cf \- directory | 7zr a \-si directory.tar.7z ++ \- to restore your backup : 7zr x \-so directory.tar.7z | tar xf \- + + If you want to send files and directories (not the owner of file) + to others Unix/MacOS/Windows users, you can use the 7-zip format. @@ -156,16 +250,16 @@ solid archive = on .B 7zr a \-sfx archive.exe dir1 @@ -831,7 +891,8 @@ index fb2dcfd..494efc9 100644 +.BR zip(1), .PP .SH "HTML Documentation" - /usr/share/doc/p7zip/DOC/MANUAL/start.htm (avabilable when the p7zip-full package is installed) +-{DEST_SHARE_DOC}/MANUAL/index.htm ++/usr/share/doc/p7zip/DOC/MANUAL/start.htm (avabilable when the p7zip-full package is installed) .SH AUTHOR .TP -Written for Debian by Mohammed Adnene Trojette. diff --git a/p7zip.spec b/p7zip.spec index 902ab8e..d6377f2 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -22,11 +22,10 @@ URL: http://p7zip.sourceforge.net/ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.14-norar_cmake.patch # from Debain +Patch4: p7zip-manpages.patch Patch5: 02-man.patch Patch6: CVE-2016-9296.patch Patch7: 05-hardening-flags.patch -Patch8: 09-man-update.patch -Patch9: 10-drop-fm-doc.patch Patch10: 13-CVE-2017-17969.patch Patch11: 14-Fix-g++-warning.patch From 7db88227feb3121c7025159c4557be646123018c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 6 Feb 2018 11:36:46 +0000 Subject: [PATCH 79/86] Improve security patch --- ...E-2017-17969.patch => CVE-2017-17969.patch | 26 +++++++++---------- p7zip.spec | 7 +++-- 2 files changed, 18 insertions(+), 15 deletions(-) rename 13-CVE-2017-17969.patch => CVE-2017-17969.patch (50%) diff --git a/13-CVE-2017-17969.patch b/CVE-2017-17969.patch similarity index 50% rename from 13-CVE-2017-17969.patch rename to CVE-2017-17969.patch index 9a820af..ebc0ac9 100644 --- a/13-CVE-2017-17969.patch +++ b/CVE-2017-17969.patch @@ -1,26 +1,26 @@ -From: =?utf-8?q?Antoine_Beaupr=C3=A9?= -Date: Sun, 28 Jan 2018 21:19:50 +0100 -Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta +From 79bca880ce7bcf07216c45f93afea545e0344418 Mon Sep 17 00:00:00 2001 +From: aone +Date: Mon, 5 Feb 2018 13:01:09 +0100 +Subject: [PATCH] Security fix CVE-2017-17969 --- - CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp -index 80b7e67..4acdce5 100644 +index 80b7e67..5bb0559 100644 --- a/CPP/7zip/Compress/ShrinkDecoder.cpp +++ b/CPP/7zip/Compress/ShrinkDecoder.cpp @@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * { _stack[i++] = _suffixes[cur]; cur = _parents[cur]; -- } -+ if (i >= kNumItems) -+ break; -+ } -+ -+ if (i >= kNumItems) -+ break; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; _stack[i++] = (Byte)cur; lastChar2 = (Byte)cur; diff --git a/p7zip.spec b/p7zip.spec index d6377f2..c917a96 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 9%{?dist} +Release: 10%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -26,7 +26,7 @@ Patch4: p7zip-manpages.patch Patch5: 02-man.patch Patch6: CVE-2016-9296.patch Patch7: 05-hardening-flags.patch -Patch10: 13-CVE-2017-17969.patch +Patch10: CVE-2017-17969.patch Patch11: 14-Fix-g++-warning.patch BuildRequires: cmake @@ -171,6 +171,9 @@ make test %changelog +* Tue Feb 06 2018 SĂŠrgio Basto - 16.02-10 +- Improve security patch + * Sat Jan 27 2018 SĂŠrgio Basto - 16.02-9 - Security fix for CVE-2017-17969 (from Debian) - Add 05-hardening-flags.patch, 09-man-update.patch, 10-drop-fm-doc.patch From 6293faeb42425e313b4eb323bc17acb891f280b9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 7 Mar 2018 19:15:42 -0800 Subject: [PATCH 80/86] Rebuild to fix GCC 8 mis-compilation See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") --- p7zip.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index c917a96..fa543d5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 10%{?dist} +Release: 11%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -171,6 +171,10 @@ make test %changelog +* Wed Mar 07 2018 Adam Williamson - 16.02-11 +- Rebuild to fix GCC 8 mis-compilation + See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") + * Tue Feb 06 2018 SĂŠrgio Basto - 16.02-10 - Improve security patch From e3e52b205d34eb055a68126aa904b49e3f65b62e Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 9 Jul 2018 00:09:29 -0400 Subject: [PATCH 81/86] Rebuild with wxWidgets 3.0 --- p7zip.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index fa543d5..6a1b916 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 11%{?dist} +Release: 12%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -32,7 +32,7 @@ Patch11: 14-Fix-g++-warning.patch BuildRequires: cmake %if %{with gui} # for 7zG GUI -BuildRequires: wxGTK-devel +BuildRequires: wxGTK3-devel BuildRequires: kde-filesystem %endif %ifarch %{ix86} @@ -171,6 +171,9 @@ make test %changelog +* Mon Jul 09 2018 Scott Talbert - 16.02-12 +- Rebuild with wxWidgets 3.0 + * Wed Mar 07 2018 Adam Williamson - 16.02-11 - Rebuild to fix GCC 8 mis-compilation See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") From d35b5334467ae2774a7cf67fe84004dc78bf40ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 15:22:50 +0000 Subject: [PATCH 82/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 6a1b916..6b98d69 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 12%{?dist} +Release: 13%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -171,6 +171,9 @@ make test %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 16.02-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Scott Talbert - 16.02-12 - Rebuild with wxWidgets 3.0 From 9adc155d933dbee212bb36ff2c5058bec1a3b64b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 18 Jul 2018 20:32:10 +0100 Subject: [PATCH 83/86] https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- p7zip.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/p7zip.spec b/p7zip.spec index 6b98d69..838a4fb 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -29,6 +29,8 @@ Patch7: 05-hardening-flags.patch Patch10: CVE-2017-17969.patch Patch11: 14-Fix-g++-warning.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake %if %{with gui} # for 7zG GUI @@ -173,6 +175,7 @@ make test %changelog * Fri Jul 13 2018 Fedora Release Engineering - 16.02-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +- https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot * Mon Jul 09 2018 Scott Talbert - 16.02-12 - Rebuild with wxWidgets 3.0 From cadf481b26a74b52262189080d22b367ffe07abb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:00 +0100 Subject: [PATCH 84/86] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- p7zip.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 838a4fb..e6a0a21 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -51,7 +51,6 @@ compression ratio. The original version can be found at http://www.7-zip.org/. %package plugins Summary: Additional plugins for p7zip -Group: Applications/Archiving %description plugins Additional plugins that can be used with 7z to extend its abilities. From ae52d4ba4868956a660fb0b130d0c68ea97db025 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 17:47:18 +0000 Subject: [PATCH 85/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index e6a0a21..77d4491 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 13%{?dist} +Release: 14%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -172,6 +172,9 @@ make test %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 16.02-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 16.02-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot From d08c648de85cc1f305e90ed2143d2d896e2a6d5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 23:51:38 +0000 Subject: [PATCH 86/86] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- p7zip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/p7zip.spec b/p7zip.spec index 77d4491..5044a9e 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -7,7 +7,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 16.02 -Release: 14%{?dist} +Release: 15%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) URL: http://p7zip.sourceforge.net/ @@ -172,6 +172,9 @@ make test %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 16.02-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 16.02-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild