From 4b709c7a4de79a5ecc3633f3660f54e6d693dc28 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:30:18 +0000 Subject: [PATCH 1/7] 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 2/7] 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 69cb4404f5a5851eef0d8dfc298b5afa2fcf7226 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Thu, 8 Jul 2010 12:31:38 +0000 Subject: [PATCH 3/7] 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 9bfbacca79cce3aa11f23af309fbdbcf5d73065f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 05:25:08 +0000 Subject: [PATCH 4/7] 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 9ce9b2dcc2d30bbe0ac6224e2ca9930aba48c83c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 07:52:03 -0600 Subject: [PATCH 5/7] - 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 6/7] 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 7/7] 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 ++