p7zip-9.38-1.parabola1: updating version

3 files changed, 890 insertions, 126 deletions

diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
index 3dab7ab64..5c699e2bc 100644
--- a/libre/p7zip/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $
+# $Id: PKGBUILD 231209 2015-02-09 23:18:55Z bisson $
 # Contributor (Arch): Thayer Williams <thayer@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
 # Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=p7zip-libre
 pkgname=p7zip
-pkgver=9.20.1
-pkgrel=9.parabola1
+pkgver=9.38
+pkgrel=1.parabola1
 pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -16,16 +17,19 @@ arch=('i686' 'x86_64' 'mips64el')
 conflicts=('p7zip-libre')
 replaces=('p7zip-libre')
 depends=('gcc-libs' 'bash')
-optdepends=('wxgtk2.8: GUI'
+optdepends=('wxgtk: GUI'
             'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk2.8')
+makedepends=('yasm' 'nasm' 'wxgtk')
 mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2")
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2"
-        '7zFM.desktop' 'libre.patch')
-mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7')
-sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8'
+        '7zFM.desktop'
+        'osversion.patch'
+        'libre.patch')
+mksha1sums=('693bc2a1426df7a12762b4542a8327add23f0dc3')
+sha1sums=('b8e52e929577e603380a20371f359863d3e22466'
           'f2c370d6f1b286b7ce9a2804e22541b755616a40'
-          'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3')
+          '8c086db1c7be0d52d2ac971f44adbdccf6dd82de'
+          '33821327ea734f218ed284ff03e8a0d0ac945070')
 
 options=('!makeflags')
 install=install
@@ -35,9 +39,10 @@ mksource() {
 
 	# Remove nonfree unRAR utility files from the source
 	rm -rv CPP/7zip/{Archive,Compress}/Rar
-	rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
+	rm -v CPP/7zip/Compress/{Rar{1,2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
 	rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h}
-	rm -v DOCS/unRarLicense.txt
+	rm -v Utils/file_Codecs_Rar29_so.py
+	rm -v DOC/unRarLicense.txt
 
 	# Remove nonfree parent folder icon
 	rm CPP/7zip/UI/FileManager/res/ParentFolder.h
@@ -45,17 +50,15 @@ mksource() {
 
 prepare() {
 	cd "${srcdir}/${pkgname}_${pkgver}"
+	[[ $CARCH = x86_64 ]] &&
+	cp makefile.linux_amd64_asm makefile.machine ||
+	cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+
+	patch -p1 -i ../osversion.patch
+	sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend
 
 	# remove rar and parent folder icon references
 	patch -Np1 -i ../libre.patch
-
-	rm GUI/kde4/p7zip_compress.desktop
-	[[ $CARCH = x86_64 ]] \
-	&& cp makefile.linux_amd64_asm makefile.machine \
-	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-
-	sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \
-		CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile
 }
 
 build() {
@@ -70,10 +73,11 @@ package() {
 		DEST_HOME="/usr" \
 		DEST_MAN="/usr/share/man"
 
-	# Licenses
+	# Doc and licenses
+	cp -a DOC/* "${pkgdir}"/usr/share/doc/p7zip
 	install -d "${pkgdir}"/usr/share/licenses/p7zip
 	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
-		/usr/share/doc/p7zip/DOCS/License.txt
+		/usr/share/doc/p7zip/License.txt
 
 	# Integration with stuff...
 	install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
@@ -85,5 +89,5 @@ package() {
 	find GUI/help -type d -exec chmod 755 {} \;
 	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
 
-	chmod -R u+w "${pkgdir}/usr"
+	chmod -R u+w,o+r "${pkgdir}/usr"
 }
diff --git a/libre/p7zip/libre.patch b/libre/p7zip/libre.patch
index 86b2caebc..c63f661af 100644
--- a/libre/p7zip/libre.patch
+++ b/libre/p7zip/libre.patch
@@ -1,48 +1,426 @@
-diff -Nur 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 13:41:43.000000000 -0200
-+++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile	2014-05-03 11:19:47.618563272 -0300
-@@ -158,14 +158,6 @@
-   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 @@
-   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 @@
-   MyAes.o \
-   Pbkdf2HmacSha1.o \
-   RandGen.o \
--  Rar20Crypto.o \
--  RarAes.o \
-   Sha1.o \
-   WzAes.o \
-   ZipCrypto.o \
-diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp
---- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp	2010-11-07 13:55:36.000000000 -0200
-+++ p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp	2014-05-03 11:28:17.542065931 -0300
-@@ -774,8 +774,6 @@
+diff -Nur p7zip_9.38.orig/CPP/7zip/Archive/7z/7zUpdate.cpp p7zip_9.38/CPP/7zip/Archive/7z/7zUpdate.cpp
+--- p7zip_9.38.orig/CPP/7zip/Archive/7z/7zUpdate.cpp	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/Archive/7z/7zUpdate.cpp	2015-02-11 01:04:25.880212590 -0200
+@@ -186,7 +186,7 @@
+ }
+ 
+ static const char *g_Exts =
+-  " lzma 7z ace arc arj bz bz2 deb lzo lzx gz pak rpm sit tgz tbz tbz2 tgz cab ha lha lzh rar zoo"
++  " lzma 7z ace arc arj bz bz2 deb lzo lzx gz pak rpm sit tgz tbz tbz2 tgz cab ha lha lzh zoo"
+   " zip jar ear war msi"
+   " 3gp avi mov mpeg mpg mpe wmv"
+   " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav"
+diff -Nur p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.depend p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.depend
+--- p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.depend	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.depend	2015-02-11 01:27:26.540889138 -0200
+@@ -2926,136 +2926,6 @@
+  ../../../../CPP/7zip/Archive/../Common/../Archive/../../Common/MyTypes.h \
+  ../../../../CPP/7zip/Archive/../Common/StreamUtils.h \
+  ../../../../CPP/7zip/Archive/../Common/../IStream.h
+-RarHandler.o: ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
+- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \
+- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \
+- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \
+- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \
+- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \
+- ../../../Common/MyTypes.h ../../../include_windows/windows.h \
+- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../../C/CpuArch.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../../C/7zTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/ComTry.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyWindows.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/IntToString.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/UTFConvert.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyString.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyVector.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Windows/PropVariantUtils.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Windows/../Common/MyString.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Windows/PropVariant.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Windows/../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Windows/../Common/MyWindows.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Windows/TimeUtils.h \
+- ../../../../CPP/7zip/Archive/Rar/../../IPassword.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyUnknown.h \
+- ../../../../CPP/7zip/Archive/Rar/../../IDecl.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/CreateCoder.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyWindows.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/NewHandler.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyString.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../ICoder.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../IStream.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyUnknown.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../IDecl.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/MethodId.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/FilterCoder.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../IPassword.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/LimitedStreams.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyBuffer.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/Defs.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../../Common/MyVector.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../IStream.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/MethodId.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/ProgressUtils.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../IProgress.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/RegisterArc.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/IArchive.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../IProgress.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../IStream.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../PropID.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/../Archive/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Common/StreamUtils.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Compress/CopyCoder.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Compress/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Compress/../ICoder.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/Rar20Crypto.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../ICoder.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../IPassword.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/RarAes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../../C/Aes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../../C/7zTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/../../Common/MyBuffer.h \
+- ../../../../CPP/7zip/Archive/Rar/../../Crypto/MyAes.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/FindSignature.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/../../IStream.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/ItemNameUtils.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/../../../Common/MyString.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/OutStreamWithCRC.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/../../../../C/7zCrc.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/../../../../C/7zTypes.h \
+- ../../../../CPP/7zip/Archive/Rar/../Common/../../../Common/MyCom.h \
+- ../../../../CPP/7zip/Archive/Rar/RarHandler.h \
+- ../../../../CPP/7zip/Archive/Rar/../IArchive.h \
+- ../../../../CPP/7zip/Archive/Rar/RarItem.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/StringConvert.h \
+- ../../../../CPP/7zip/Archive/Rar/RarHeader.h \
+- ../../../../CPP/7zip/Archive/Rar/../../../Common/MyTypes.h
+-RpmHandler.o: ../../../../CPP/7zip/Archive/RpmHandler.cpp \
+- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \
+- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \
+- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \
+- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \
+- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \
+- ../../../Common/MyTypes.h ../../../include_windows/windows.h \
+- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \
+- ../../../../CPP/7zip/Archive/../../../C/CpuArch.h \
+- ../../../../CPP/7zip/Archive/../../../C/7zTypes.h \
+- ../../../../CPP/7zip/Archive/../../Common/ComTry.h \
+- ../../../../CPP/7zip/Archive/../../Common/MyWindows.h \
+- ../../../../CPP/7zip/Archive/../../Common/IntToString.h \
+- ../../../../CPP/7zip/Archive/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/../../Common/MyString.h \
+- ../../../../CPP/7zip/Archive/../../Common/MyVector.h \
+- ../../../../CPP/7zip/Archive/../../Common/StringConvert.h \
+- ../../../../CPP/7zip/Archive/../../Common/MyString.h \
+- ../../../../CPP/7zip/Archive/../../Common/UTFConvert.h \
+- ../../../../CPP/7zip/Archive/../../Windows/PropVariant.h \
+- ../../../../CPP/7zip/Archive/../../Windows/../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/../../Windows/../Common/MyWindows.h \
+- ../../../../CPP/7zip/Archive/../../Windows/TimeUtils.h \
+- ../../../../CPP/7zip/Archive/../Common/LimitedStreams.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/MyBuffer.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/Defs.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/MyWindows.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/NewHandler.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/MyVector.h \
+- ../../../../CPP/7zip/Archive/../Common/../IStream.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/../Common/../../Common/MyUnknown.h \
+- ../../../../CPP/7zip/Archive/../Common/../IDecl.h \
+- ../../../../CPP/7zip/Archive/../Common/ProgressUtils.h \
+- ../../../../CPP/7zip/Archive/../Common/../ICoder.h \
+- ../../../../CPP/7zip/Archive/../Common/../IStream.h \
+- ../../../../CPP/7zip/Archive/../Common/../IProgress.h \
+- ../../../../CPP/7zip/Archive/../Common/RegisterArc.h \
+- ../../../../CPP/7zip/Archive/../Common/../Archive/IArchive.h \
+- ../../../../CPP/7zip/Archive/../Common/../Archive/../IProgress.h \
+- ../../../../CPP/7zip/Archive/../Common/../Archive/../IStream.h \
+- ../../../../CPP/7zip/Archive/../Common/../Archive/../PropID.h \
+- ../../../../CPP/7zip/Archive/../Common/../Archive/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Archive/../Common/StreamUtils.h \
+- ../../../../CPP/7zip/Archive/../Compress/CopyCoder.h \
+- ../../../../CPP/7zip/Archive/../Compress/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Archive/../Compress/../ICoder.h
+ SplitHandler.o: ../../../../CPP/7zip/Archive/SplitHandler.cpp \
+  ../../../myWindows/StdAfx.h ../../../myWindows/config.h \
+  ../../../Common/Common.h ../../../Common/../../C/Compiler.h \
+@@ -6345,53 +6215,6 @@
+  ../../../../CPP/7zip/Crypto/RandGen.h \
+  ../../../../CPP/7zip/Crypto/../../../C/Sha256.h \
+  ../../../../CPP/7zip/Crypto/../../../C/7zTypes.h
+-Rar20Crypto.o: ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
+- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \
+- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \
+- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \
+- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \
+- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \
+- ../../../Common/MyTypes.h ../../../include_windows/windows.h \
+- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \
+- ../../../../CPP/7zip/Crypto/../../../C/7zCrc.h \
+- ../../../../CPP/7zip/Crypto/../../../C/7zTypes.h \
+- ../../../../CPP/7zip/Crypto/../../../C/CpuArch.h \
+- ../../../../CPP/7zip/Crypto/../../../C/RotateDefs.h \
+- ../../../../CPP/7zip/Crypto/Rar20Crypto.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyWindows.h \
+- ../../../../CPP/7zip/Crypto/../../Common/NewHandler.h \
+- ../../../../CPP/7zip/Crypto/../ICoder.h \
+- ../../../../CPP/7zip/Crypto/../IStream.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyUnknown.h \
+- ../../../../CPP/7zip/Crypto/../IDecl.h \
+- ../../../../CPP/7zip/Crypto/../IPassword.h
+-RarAes.o: ../../../../CPP/7zip/Crypto/RarAes.cpp \
+- ../../../myWindows/StdAfx.h ../../../myWindows/config.h \
+- ../../../Common/Common.h ../../../Common/../../C/Compiler.h \
+- ../../../Common/MyWindows.h ../../../Common/MyGuidDef.h \
+- ../../../Common/MyTypes.h ../../../Common/../../C/7zTypes.h \
+- ../../../Common/NewHandler.h ../../../Common/MyWindows.h \
+- ../../../Common/MyTypes.h ../../../include_windows/windows.h \
+- ../../../include_windows/basetyps.h ../../../include_windows/tchar.h \
+- ../../../../CPP/7zip/Crypto/RarAes.h \
+- ../../../../CPP/7zip/Crypto/../../../C/Aes.h \
+- ../../../../CPP/7zip/Crypto/../../../C/7zTypes.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyBuffer.h \
+- ../../../../CPP/7zip/Crypto/../../Common/Defs.h \
+- ../../../../CPP/7zip/Crypto/../IPassword.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyTypes.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyUnknown.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyWindows.h \
+- ../../../../CPP/7zip/Crypto/../IDecl.h \
+- ../../../../CPP/7zip/Crypto/MyAes.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyCom.h \
+- ../../../../CPP/7zip/Crypto/../../Common/NewHandler.h \
+- ../../../../CPP/7zip/Crypto/../ICoder.h \
+- ../../../../CPP/7zip/Crypto/../IStream.h \
+- ../../../../CPP/7zip/Crypto/Sha1.h \
+- ../../../../CPP/7zip/Crypto/../../Common/MyTypes.h
+ Sha1.o: ../../../../CPP/7zip/Crypto/Sha1.cpp ../../../myWindows/StdAfx.h \
+  ../../../myWindows/config.h ../../../Common/Common.h \
+  ../../../Common/../../C/Compiler.h ../../../Common/MyWindows.h \
+diff -Nur p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.list
+--- p7zip_9.38.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/Bundles/Format7zFree/makefile.list	2015-02-11 00:30:12.429937156 -0200
+@@ -71,7 +71,6 @@
+   ../../../../CPP/7zip/Archive/NtfsHandler.cpp \
+   ../../../../CPP/7zip/Archive/PeHandler.cpp \
+   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
+-  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
+   ../../../../CPP/7zip/Archive/RpmHandler.cpp \
+   ../../../../CPP/7zip/Archive/SplitHandler.cpp \
+   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
+@@ -174,8 +173,6 @@
+   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
+   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
+   ../../../../CPP/7zip/Crypto/RandGen.cpp \
+-  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
+-  ../../../../CPP/7zip/Crypto/RarAes.cpp \
+   ../../../../CPP/7zip/Crypto/Sha1.cpp \
+   ../../../../CPP/7zip/Crypto/Sha1Reg.cpp \
+   ../../../../CPP/7zip/Crypto/WzAes.cpp \
+@@ -453,8 +450,6 @@
+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PeHandler.cpp
+ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp
+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp
+-RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp
+ RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp
+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp
+ SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp
+@@ -659,10 +654,6 @@
+ 	$(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
+-RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp
+-	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp
+ Sha1.o : ../../../../CPP/7zip/Crypto/Sha1.cpp
+ 	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Sha1.cpp
+ Sha1Reg.o : ../../../../CPP/7zip/Crypto/Sha1Reg.cpp
+@@ -828,7 +819,6 @@
+  NtfsHandler.o \
+  PeHandler.o \
+  PpmdHandler.o \
+- RarHandler.o \
+  RpmHandler.o \
+  SplitHandler.o \
+  SquashfsHandler.o \
+@@ -931,8 +921,6 @@
+  MyAesReg.o \
+  Pbkdf2HmacSha1.o \
+  RandGen.o \
+- Rar20Crypto.o \
+- RarAes.o \
+  Sha1.o \
+  Sha1Reg.o \
+  WzAes.o \
+diff -Nur p7zip_9.38.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_9.38/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt
+--- p7zip_9.38.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt	2015-02-11 00:46:31.224729754 -0200
+@@ -120,7 +120,6 @@
+   "../../../../CPP/7zip/Archive/NtfsHandler.cpp"
+   "../../../../CPP/7zip/Archive/PeHandler.cpp"
+   "../../../../CPP/7zip/Archive/PpmdHandler.cpp"
+-  "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp"
+   "../../../../CPP/7zip/Archive/RpmHandler.cpp"
+   "../../../../CPP/7zip/Archive/SplitHandler.cpp"
+   "../../../../CPP/7zip/Archive/SquashfsHandler.cpp"
+@@ -223,8 +222,6 @@
+   "../../../../CPP/7zip/Crypto/MyAesReg.cpp"
+   "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp"
+   "../../../../CPP/7zip/Crypto/RandGen.cpp"
+-  "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp"
+-  "../../../../CPP/7zip/Crypto/RarAes.cpp"
+   "../../../../CPP/7zip/Crypto/Sha1.cpp"
+   "../../../../CPP/7zip/Crypto/Sha1Reg.cpp"
+   "../../../../CPP/7zip/Crypto/WzAes.cpp"
+diff -Nur p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.cpp p7zip_9.38/CPP/7zip/Crypto/Sha1.cpp
+--- p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.cpp	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/Crypto/Sha1.cpp	2015-02-11 00:45:40.547653068 -0200
+@@ -130,35 +130,6 @@
+   _count2 = curBufferPos;
+ }
+ 
+-void CContext::UpdateRar(Byte *data, size_t size, bool rar350Mode)
+-{
+-  bool returnRes = false;
+-  unsigned curBufferPos = _count2;
+-  while (size--)
+-  {
+-    unsigned pos = (curBufferPos & 3);
+-    if (pos == 0)
+-      _buffer[curBufferPos >> 2] = 0;
+-    _buffer[curBufferPos >> 2] |= ((UInt32)*data++) << (8 * (3 - pos));
+-    if (++curBufferPos == kBlockSize)
+-    {
+-      curBufferPos = 0;
+-      CContextBase::UpdateBlock(_buffer, returnRes);
+-      if (returnRes)
+-        for (unsigned i = 0; i < kBlockSizeInWords; i++)
+-        {
+-          UInt32 d = _buffer[i];
+-          data[(int)i * 4 + 0 - (int)kBlockSize] = (Byte)(d);
+-          data[(int)i * 4 + 1 - (int)kBlockSize] = (Byte)(d >>  8);
+-          data[(int)i * 4 + 2 - (int)kBlockSize] = (Byte)(d >> 16);
+-          data[(int)i * 4 + 3 - (int)kBlockSize] = (Byte)(d >> 24);
+-        }
+-      returnRes = rar350Mode;
+-    }
+-  }
+-  _count2 = curBufferPos;
+-}
+-
+ void CContext::Final(Byte *digest)
+ {
+   const UInt64 lenInBits = (_count << 9) + ((UInt64)_count2 << 3);
+diff -Nur p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.h p7zip_9.38/CPP/7zip/Crypto/Sha1.h
+--- p7zip_9.38.orig/CPP/7zip/Crypto/Sha1.h	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/Crypto/Sha1.h	2015-02-11 01:03:20.456339087 -0200
+@@ -9,10 +9,6 @@
+ 
+ #include "../../Common/MyTypes.h"
+ 
+-// Sha1 implementation in RAR before version 3.60 has bug:
+-// it changes data bytes in some cases.
+-// So this class supports both versions: normal_SHA and rar3Mode
+-
+ namespace NCrypto {
+ namespace NSha1 {
+ 
+@@ -53,7 +49,6 @@
+ {
+ public:
+   void Update(const Byte *data, size_t size);
+-  void UpdateRar(Byte *data, size_t size, bool rar350Mode);
+   void Final(Byte *digest);
+ };
+ 
+diff -Nur p7zip_9.38.orig/CPP/7zip/Guid.txt p7zip_9.38/CPP/7zip/Guid.txt
+--- p7zip_9.38.orig/CPP/7zip/Guid.txt	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/Guid.txt	2015-02-11 00:44:03.300174458 -0200
+@@ -132,7 +132,6 @@
+ 
+   01 Zip
+   02 BZip2
+-  03 Rar
+   04 Arj
+   05 Z
+   06 Lzh
+diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Client7z/Client7z.cpp p7zip_9.38/CPP/7zip/UI/Client7z/Client7z.cpp
+--- p7zip_9.38.orig/CPP/7zip/UI/Client7z/Client7z.cpp	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/UI/Client7z/Client7z.cpp	2015-02-11 01:06:18.167807974 -0200
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ // Tou can find the list of all GUIDs in Guid.txt file.
+-// use another CLSIDs, if you want to support other formats (zip, rar, ...).
++// use another CLSIDs, if you want to support other formats (zip, ...).
+ // {23170F69-40C1-278A-1000-000110070000}
+ DEFINE_GUID(CLSID_CFormat7z,
+   0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00);
+diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/LoadCodecs.h p7zip_9.38/CPP/7zip/UI/Common/LoadCodecs.h
+--- p7zip_9.38.orig/CPP/7zip/UI/Common/LoadCodecs.h	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/UI/Common/LoadCodecs.h	2015-02-11 00:43:34.319931310 -0200
+@@ -110,7 +110,6 @@
+   void AddExts(const UString &ext, const UString &addExt);
+ 
+   bool IsSplit() const { return StringsAreEqualNoCase_Ascii(Name, "Split"); }
+-  // bool IsRar() const { return StringsAreEqualNoCase_Ascii(Name, "Rar"); }
+ 
+   CArcInfoEx():
+       Flags(0),
+diff -Nur p7zip_9.38.orig/CPP/7zip/UI/Common/OpenArchive.cpp p7zip_9.38/CPP/7zip/UI/Common/OpenArchive.cpp
+--- p7zip_9.38.orig/CPP/7zip/UI/Common/OpenArchive.cpp	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/UI/Common/OpenArchive.cpp	2015-02-11 00:36:30.699723469 -0200
+@@ -856,7 +856,6 @@
+ {
+     "7z"
+   , "xz"
+-  , "rar"
+   , "bzip2"
+   , "gzip"
+   , "cab"
+@@ -1443,29 +1442,6 @@
+         {
+           // signature search was here
+         }
+-        else if (extension == L"000" || extension == L"001")
+-        {
+-          int i = FindFormatForArchiveType(op.codecs, orderIndices, "rar");
+-          if (i >= 0)
+-          {
+-            const size_t kBufSize = (1 << 10);
+-            byteBuffer.Alloc(kBufSize);
+-            size_t processedSize = kBufSize;
+-            RINOK(ReadStream(op.stream, byteBuffer, &processedSize));
+-            if (processedSize >= 16)
+-            {
+-              const Byte *buf = byteBuffer;
+-              const Byte kRarHeader[] = { 0x52 , 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 };
+-              if (TestSignature(buf, kRarHeader, 7) && buf[9] == 0x73 && (buf[10] & 1) != 0)
+-              {
+-                orderIndices2.Add(orderIndices[i]);
+-                orderIndices[i] = -1;
+-                if (i >= (int)numFinded)
+-                  numFinded++;
+-              }
+-            }
+-          }
+-        }
+         else
+         {
+           const size_t kBufSize = (1 << 10);
+diff -Nur p7zip_9.38.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.38/CPP/7zip/UI/FileManager/FM_rc.cpp
+--- p7zip_9.38.orig/CPP/7zip/UI/FileManager/FM_rc.cpp	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/UI/FileManager/FM_rc.cpp	2015-02-11 00:19:25.381597838 -0200
+@@ -815,8 +815,6 @@
  
  /////////////////////////////////////////////////////
  
@@ -51,7 +429,7 @@ diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7
  	SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) :
  	       	wxPanel(parent,id) , m_frame(frame), _wList(0)
  	{
-@@ -793,7 +791,7 @@
+@@ -834,7 +832,7 @@
  		int sizes[] = {150, 250, 350, -1};
  		wxArrayString pathArray;
  		wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL);
@@ -60,29 +438,416 @@ diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7
  		m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT );
  		pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0);
  		pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5);
-diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend
---- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend	2011-02-19 07:33:17.000000000 -0200
-+++ p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend	2014-05-03 11:28:17.545399286 -0300
-@@ -714,7 +714,7 @@
-  res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \
-  res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \
-  ../../../Common/MyString.h ../../../Windows/ResourceString.h \
-- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h
-+ /usr/include/wx-2.8/wx/mstream.h
- OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \
-  ../../../myWindows/config.h ../../../Common/MyWindows.h \
-  ../../../Common/MyGuidDef.h ../../../Common/Types.h \
-diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile
---- p7zip_9.20.1.orig/makefile	2011-03-13 08:52:45.000000000 -0300
-+++ p7zip_9.20.1/makefile	2014-05-03 11:19:47.618563272 -0300
+diff -Nur p7zip_9.38.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.38/CPP/7zip/UI/FileManager/makefile.depend
+--- p7zip_9.38.orig/CPP/7zip/UI/FileManager/makefile.depend	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/7zip/UI/FileManager/makefile.depend	2015-02-11 00:23:18.466708442 -0200
+@@ -2643,8 +2643,7 @@
+  ../../../../CPP/7zip/UI/FileManager/res/Info2PNG.h \
+  /usr/include/wx-3.0/wx/mstream.h /usr/include/wx-3.0/wx/listctrl.h \
+  /usr/include/wx-3.0/wx/listbase.h \
+- /usr/include/wx-3.0/wx/generic/listctrl.h \
+- ../../../../CPP/7zip/UI/FileManager/res/ParentFolder.h
++ /usr/include/wx-3.0/wx/generic/listctrl.h
+ FSDrives.o: ../../../../CPP/7zip/UI/FileManager/FSDrives.cpp \
+  ../../../myWindows/StdAfx.h ../../../myWindows/config.h \
+  ../../../Common/Common.h ../../../Common/../../C/Compiler.h \
+diff -Nur p7zip_9.38.orig/CPP/ANDROID/Format7zFree/jni/Android.mk p7zip_9.38/CPP/ANDROID/Format7zFree/jni/Android.mk
+--- p7zip_9.38.orig/CPP/ANDROID/Format7zFree/jni/Android.mk	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/CPP/ANDROID/Format7zFree/jni/Android.mk	2015-02-11 00:54:16.375224803 -0200
+@@ -88,7 +88,6 @@
+   ../../../../CPP/7zip/Archive/NtfsHandler.cpp \
+   ../../../../CPP/7zip/Archive/PeHandler.cpp \
+   ../../../../CPP/7zip/Archive/PpmdHandler.cpp \
+-  ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \
+   ../../../../CPP/7zip/Archive/RpmHandler.cpp \
+   ../../../../CPP/7zip/Archive/SplitHandler.cpp \
+   ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \
+@@ -191,8 +190,6 @@
+   ../../../../CPP/7zip/Crypto/MyAesReg.cpp \
+   ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \
+   ../../../../CPP/7zip/Crypto/RandGen.cpp \
+-  ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \
+-  ../../../../CPP/7zip/Crypto/RarAes.cpp \
+   ../../../../CPP/7zip/Crypto/Sha1.cpp \
+   ../../../../CPP/7zip/Crypto/Sha1Reg.cpp \
+   ../../../../CPP/7zip/Crypto/WzAes.cpp \
+diff -Nur p7zip_9.38.orig/ChangeLog p7zip_9.38/ChangeLog
+--- p7zip_9.38.orig/ChangeLog	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/ChangeLog	2015-02-11 01:08:43.782348145 -0200
+@@ -9,7 +9,6 @@
+ 
+   - From Windows version of 7-zip 
+      - bug#138 If you extract the password with # program crashes 
+-       7z now supports long password in RAR 3 and 4.
+ 
+    
+ 
+@@ -40,12 +39,6 @@
+   - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack
+  
+ 
+-Version 9.20.1
+-==============
+-
+-  - #3211479 "p7zip 9.20 - "unsupported method" with RAR files - " fixed
+-  	"install.sh" installs again "bin/Codecs/Rar29.so"
+-
+ Version 9.20
+ ============
+ 
+@@ -118,8 +111,6 @@
+     - Some bugs were fixed.
+ 
+   
+-  - #2863580 "Crash in Rar decoder on a corrupted file" fixed
+-
+   - #2860898 "Dereferencing a zero pointer in cab handler" fixed
+ 
+   - #2860679 "Division by zero in cab decoder" fixed
+@@ -248,7 +239,7 @@
+     - It's allowed to use -t switch for "list" and "extract" commands.
+     - Some bugs were fixed.
+ 
+-  - Bug : wrong timestamp for files extracted from .zip or .rar archives
++  - Bug : wrong timestamp for files extracted from .zip archives
+ 
+ 
+ Version 4.58
+@@ -261,8 +252,6 @@
+         2) -mcu switch:  7-Zip uses UTF-8, if there are non-ASCII symbols.
+         3) -mcl switch:  7-Zip uses local code page.
+     - Now it's possible to store file creation time in 7z and ZIP archives (-mtc switch).
+-    - 7-Zip now can unpack multivolume RAR archives created with 
+-      "old style volume names" scheme and names *.001, *.002, ...
+     - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on  
+     - Some bugs were fixed.  
+ 
+@@ -598,8 +587,6 @@
+ 
+   - patch #1465026 - Patch for install.sh for packagers
+ 
+-  - DosDateTimeToFileTime fixed (rar format)
+-
+   - contrib/VirtualFileSystemForMidnightCommander/u7z updated
+     (thank sgh_punk)
+ 
+@@ -716,8 +703,6 @@
+     - Some bugs were fixed
+     - DOCS/MANUAL/exit_codes.htm added
+ 
+-  - new plugin for 7z : RAR format support (extracting only)
+-
+   - better dependencies in makefile
+ 
+ Version 4.23
+@@ -905,9 +890,6 @@
+   - new port of 7za from the source of 7za 4.10Beta for Windows
+     => p7zip now work on big endian CPU.
+ 
+-  - 7z for Unix is not maintain anymore (because as the source of unrar plugin for 7z
+-    is not available, 7z is unless on Unix).
+-
+ Version 0.91
+ ============
+   - add support for FreeBSD 5.2.1
+diff -Nur p7zip_9.38.orig/DOC/License.txt p7zip_9.38/DOC/License.txt
+--- p7zip_9.38.orig/DOC/License.txt	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/DOC/License.txt	2015-02-11 00:56:11.542823857 -0200
+@@ -5,14 +5,7 @@
+ 
+   7-Zip Copyright (C) 1999-2015 Igor Pavlov.
+ 
+-  Licenses for files are:
+-
+-    1) CPP/7zip/Compress/Rar* files:  GNU LGPL + unRAR restriction
+-    2) All other files:  GNU LGPL
+-
+-  The GNU LGPL + unRAR restriction means that you must follow both 
+-  GNU LGPL rules and unRAR restriction rules.
+-
++  Licenses for files are GNU LGPL.
+ 
+   GNU LGPL information
+   --------------------
+@@ -32,21 +25,5 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ 
+-  unRAR restriction
+-  -----------------
+-
+-    The decompression engine for RAR archives was developed using source 
+-    code of unRAR program.
+-    All copyrights to original unRAR code are owned by Alexander Roshal.
+-
+-    The license for original unRAR code has the following restriction:
+-
+-    The unRAR sources cannot be used to re-create the RAR compression algorithm, 
+-    which is proprietary. Distribution of modified unRAR sources in separate form 
+-    or as a part of other software is permitted, provided that it is clearly
+-    stated in the documentation and source comments that the code may
+-    not be used to develop a RAR (WinRAR) compatible archiver.
+-
+-
+   --
+   Igor Pavlov
+diff -Nur p7zip_9.38.orig/DOC/MANUAL/switches/update.htm p7zip_9.38/DOC/MANUAL/switches/update.htm
+--- p7zip_9.38.orig/DOC/MANUAL/switches/update.htm	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/DOC/MANUAL/switches/update.htm	2015-02-11 01:06:42.614677076 -0200
+@@ -139,7 +139,7 @@
+ <LI>UTC file systems: NTFS
+ <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim
+ <LI>Local time file systems : FAT, FAT32
+-<LI>Local time archive formats : rar, zip, cab
++<LI>Local time archive formats : zip, cab
+ </UL>
+ 
+ <H4>Examples</H4>
+diff -Nur p7zip_9.38.orig/DOC/Methods.txt p7zip_9.38/DOC/Methods.txt
+--- p7zip_9.38.orig/DOC/Methods.txt	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/DOC/Methods.txt	2015-02-11 00:56:40.029722102 -0200
+@@ -86,10 +86,6 @@
+       63 - wzAES
+    02 - BZip
+       02 - BZip2
+-   03 - Rar
+-      01 - Rar15
+-      02 - Rar20
+-      03 - Rar29
+    04 - Arj
+       01 - Arj (1,2,3)
+       02 - Arj 4
+@@ -121,9 +117,6 @@
+    F1 - Combine Ciphers
+       01 - Zip
+          01 - Main Zip crypto algo
+-      03 - RAR
+-         02 - 
+-         03 - Rar29 AES-128 + (modified SHA-1)
+       07 - 7z
+          01 - AES-256 + SHA-256
+ 
+diff -Nur p7zip_9.38.orig/DOC/readme.txt p7zip_9.38/DOC/readme.txt
+--- p7zip_9.38.orig/DOC/readme.txt	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/DOC/readme.txt	2015-02-11 00:55:02.545597806 -0200
+@@ -9,30 +9,9 @@
+ License Info
+ ------------
+ 
+-7-Zip is free software distributed under the GNU LGPL 
+-(except for unRar code).
++7-Zip is free software distributed under the GNU LGPL.
+ read License.txt for more infomation about license.
+ 
+-Notes about unRAR license:
+-
+-Please check main restriction from unRar license:
+-
+-   2. The unRAR sources may be used in any software to handle RAR
+-      archives without limitations free of charge, but cannot be used
+-      to re-create the RAR compression algorithm, which is proprietary.
+-      Distribution of modified unRAR sources in separate form or as a
+-      part of other software is permitted, provided that it is clearly
+-      stated in the documentation and source comments that the code may
+-      not be used to develop a RAR (WinRAR) compatible archiver.
+-
+-In brief it means:
+-1) You can compile and use compiled files under GNU LGPL rules, since 
+-   unRAR license almost has no restrictions for compiled files.
+-   You can link these compiled files to LGPL programs.
+-2) You can fix bugs in source code and use compiled fixed version.
+-3) You can not use unRAR sources to re-create the RAR compression algorithm.
+-
+-
+ LZMA SDK
+ --------
+ 
+@@ -96,7 +75,6 @@
+ ---
+   7zFormat.txt   - 7z format description
+   copying.txt    - GNU LGPL license
+-  unRarLicense.txt - License for unRAR part of source code
+   src-history.txt  - Sources history
+   Methods.txt    - Compression method IDs
+   readme.txt     - Readme file
+diff -Nur p7zip_9.38.orig/DOC/src-history.txt p7zip_9.38/DOC/src-history.txt
+--- p7zip_9.38.orig/DOC/src-history.txt	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/DOC/src-history.txt	2015-02-11 01:03:34.796457419 -0200
+@@ -140,8 +140,6 @@
+ - 7-Zip now has 128 MB dictionary limit for 32-bit version:
+   It's for speed optimization: kNumLogBits = 9 + sizeof(size_t) / 2;
+ - TAR: 'D' link flag support.
+-- 7-Zip now can unpack multivolume RAR archives created with 
+-  "old style volume names" scheme (-vn switch) and names *.001, *.002, ...
+ - Fixed bugs:
+   - 7-Zip FM could not copy / move files to root network folders like \\COMPNAME\FOLDERNAME\
+     In case of move it removed original files.
+@@ -203,7 +201,6 @@
+   stratup code, or you must add CPP/Common/CRC.cpp to your project.
+ - Method ID in .7z now is 63-bit integer (UInt64).
+ - Open error messages
+-- unRar 1.5 fixed
+ - unShrink fixed
+ - BUG of 4.43 beta and 4.44 beta was fixed.
+   7-Zip compressing to .zip in multi-threading mode didn't work in some cases.
+@@ -385,11 +382,6 @@
+     contains common resurces
+ 
+ 
+-2.30 Beta 19   2002-04-11
+--------------------------
+-- SDK/Archive/Rar/Handler.cpp
+-    supporting RAR29
+-
+ 2.30 Beta 18   2002-03-25
+ -------------------------
+ - SDK/Archive/Cab/MSZipDecoder.cpp
+diff -Nur p7zip_9.38.orig/GUI/Contents/Info.plist p7zip_9.38/GUI/Contents/Info.plist
+--- p7zip_9.38.orig/GUI/Contents/Info.plist	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/GUI/Contents/Info.plist	2015-02-11 00:58:09.453784497 -0200
+@@ -311,24 +311,6 @@
+ 		<dict>
+ 			<key>CFBundleTypeExtensions</key>
+ 			<array>
+-				<string>rar</string>
+-				<string>RAR</string>
+-				<string>.r00</string>
+-			</array>
+-			<key>CFBundleTypeIconFile</key>
+-			<string>p7zip</string>
+-			<key>CFBundleTypeName</key>
+-			<string>Rar</string>
+-			<key>CFBundleTypeRole</key>
+-			<string>Viewer</string>
+-			<key>LSTypeIsPackage</key>
+-			<false/>
+-			<key>NSPersistentStoreTypeKey</key>
+-			<string>XML</string>
+-		</dict>
+-		<dict>
+-			<key>CFBundleTypeExtensions</key>
+-			<array>
+ 				<string>ace</string>
+ 				<string>ACE</string>
+ 				<string>.c00</string>
+diff -Nur p7zip_9.38.orig/GUI/help/cmdline/switches/update.htm p7zip_9.38/GUI/help/cmdline/switches/update.htm
+--- p7zip_9.38.orig/GUI/help/cmdline/switches/update.htm	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/GUI/help/cmdline/switches/update.htm	2015-02-11 01:07:01.078163350 -0200
+@@ -139,7 +139,7 @@
+ <LI>UTC file systems: NTFS
+ <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim
+ <LI>Local time file systems : FAT, FAT32
+-<LI>Local time archive formats : rar, zip, cab
++<LI>Local time archive formats : zip, cab
+ </UL>
+ 
+ <H4>Examples</H4>
+diff -Nur p7zip_9.38.orig/GUI/help/general/formats.htm p7zip_9.38/GUI/help/general/formats.htm
+--- p7zip_9.38.orig/GUI/help/general/formats.htm	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/GUI/help/general/formats.htm	2015-02-11 01:08:24.372187139 -0200
+@@ -46,7 +46,6 @@
+   <TR> <TD align="center">NSIS</TD> <TD></TD> <TD>nsis</TD> </TR>
+   <TR> <TD align="center">NTFS</TD> <TD></TD> <TD>ntfs img</TD> </TR>
+   <TR> <TD align="center">MBR</TD> <TD></TD> <TD>mbr</TD> </TR>
+-  <TR> <TD align="center">RAR</TD> <TD></TD> <TD>rar r00</TD> </TR>
+   <TR> <TD align="center">RPM</TD>  <TD></TD> <TD>rpm</TD></TR>
+   <TR> <TD align="center">PPMD</TD> <TD></TD> <TD>ppmd</TD> </TR>
+   <TR> <TD align="center">SPLIT</TD> <TD></TD> <TD>001 002 ...</TD> </TR>
+diff -Nur p7zip_9.38.orig/README p7zip_9.38/README
+--- p7zip_9.38.orig/README	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/README	2015-02-11 00:58:49.177442615 -0200
+@@ -8,7 +8,7 @@
+ 7-zip is a file archiver with the highest compression ratio.
+ Homepage : www.7-zip.org
+ 
+-  7z uses plugins (7z.so and Codecs/Rar29.so) to handle archives.
++  7z uses plugin 7z.so to handle archives.
+   7za is a stand-alone executable.
+   7za handles less archive formats than 7z.exe.
+   7zr is a light stand-alone executable that supports only 7z/LZMA/BCJ/BCJ2.
+@@ -66,7 +66,6 @@
+ 	make sfx      : to build bin/7zCon.sfx (7za can now create SFX archive)
+ 	make 7z       : to build bin/7z and its plugins :
+                           - "bin/7z.so" (GNU LGPL + AES code license)
+-                          - "bin/Codecs/Rar29.so" (GNU LGPL + unRAR restriction)
+ 	make 7zr      : to build bin/7zr
+ 	make all      : to build bin/7za and bin/7zCon.sfx
+ 	make all2     : to build bin/7za, bin/7z (with its plugins) and bin/7zCon.sfx
+@@ -77,7 +76,6 @@
+ 
+ 	make 7zG      : to build bin/7zG and its plugins :
+                           - "bin/7z.so" (GNU LGPL + AES code license)
+-                          - "bin/Codecs/Rar29.so" (GNU LGPL + unRAR restriction)
+ 	make test_7zG : to test bin/7zG (extracting, archiving, ...)
+ 
+ 
+diff -Nur p7zip_9.38.orig/Utils/bin_to_sources.py p7zip_9.38/Utils/bin_to_sources.py
+--- p7zip_9.38.orig/Utils/bin_to_sources.py	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/Utils/bin_to_sources.py	2015-02-11 00:59:19.557691352 -0200
+@@ -13,9 +13,6 @@
+ dir0='CPP/7zip/UI/Console'
+ file0='Utils/file_7z.py'
+ 
+-dir0='CPP/7zip/Compress/Rar'
+-file0='Utils/file_Codecs_Rar29_so.py'
+-
+ dir0='CPP/7zip/Bundles/Format7zFree'
+ file0='Utils/file_7z_so.py'
+ 
+diff -Nur p7zip_9.38.orig/Utils/file_7z_so.py p7zip_9.38/Utils/file_7z_so.py
+--- p7zip_9.38.orig/Utils/file_7z_so.py	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/Utils/file_7z_so.py	2015-02-11 00:59:29.737774764 -0200
+@@ -106,7 +106,6 @@
+  'CPP/7zip/Archive/NtfsHandler.cpp',
+  'CPP/7zip/Archive/PeHandler.cpp',
+  'CPP/7zip/Archive/PpmdHandler.cpp',
+- 'CPP/7zip/Archive/Rar/RarHandler.cpp',
+  'CPP/7zip/Archive/RpmHandler.cpp',
+  'CPP/7zip/Archive/SplitHandler.cpp',
+  'CPP/7zip/Archive/SquashfsHandler.cpp',
+@@ -209,8 +208,6 @@
+  'CPP/7zip/Crypto/MyAesReg.cpp',
+  'CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp',
+  'CPP/7zip/Crypto/RandGen.cpp',
+- 'CPP/7zip/Crypto/Rar20Crypto.cpp',
+- 'CPP/7zip/Crypto/RarAes.cpp',
+  'CPP/7zip/Crypto/Sha1.cpp',
+  'CPP/7zip/Crypto/Sha1Reg.cpp',
+  'CPP/7zip/Crypto/WzAes.cpp',
+diff -Nur p7zip_9.38.orig/Utils/generate.py p7zip_9.38/Utils/generate.py
+--- p7zip_9.38.orig/Utils/generate.py	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/Utils/generate.py	2015-02-11 00:59:35.954492385 -0200
+@@ -247,7 +247,6 @@
+ import file_7zG
+ import file_7zFM
+ import file_7z_so
+-import file_Codecs_Rar29_so
+ import file_LzmaCon
+ import file_Client7z
+ import file_P7ZIP
+diff -Nur p7zip_9.38.orig/contrib/qnx630sp3/qnx630sp3-shared p7zip_9.38/contrib/qnx630sp3/qnx630sp3-shared
+--- p7zip_9.38.orig/contrib/qnx630sp3/qnx630sp3-shared	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/contrib/qnx630sp3/qnx630sp3-shared	2015-02-11 01:00:19.664850955 -0200
+@@ -8,7 +8,7 @@
+ make clean && \
+ cp makefile.qnx_shared.so makefile.machine && \
+ make 7z && \
+-mv ./bin/7z.so ../${BIN} && mv ./bin/Codecs/Rar29.so ../${BIN}/Codecs && \
++mv ./bin/7z.so ../${BIN} && \
+ make clean && \
+ mv makefile.machine.bak makefile.machine
+ echo "All done - look for binaries in ../${BIN}"
+diff -Nur p7zip_9.38.orig/makefile p7zip_9.38/makefile
+--- p7zip_9.38.orig/makefile	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/makefile	2015-02-11 00:27:17.821858982 -0200
 @@ -56,7 +56,6 @@
  	$(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 check/my_86_filter             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 @@
  common7z:common
  	$(MKDIR) bin/Codecs
@@ -96,20 +861,20 @@ diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile
  	$(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/LzmaCon      clean2
  	$(MAKE) -C CPP/7zip/Bundles/AloneGCOV    clean
  	$(MAKE) -C CPP/7zip/TEST/TestUI          clean
-diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake
---- p7zip_9.20.1.orig/makefile.oldmake	2011-03-13 08:53:08.000000000 -0300
-+++ p7zip_9.20.1/makefile.oldmake	2014-05-03 11:19:47.618563272 -0300
+diff -Nur p7zip_9.38.orig/makefile.oldmake p7zip_9.38/makefile.oldmake
+--- p7zip_9.38.orig/makefile.oldmake	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/makefile.oldmake	2015-02-11 00:26:43.094917671 -0200
 @@ -56,7 +56,6 @@
  	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 check/my_86_filter            ; $(MAKE) depend
  	cd CPP/7zip/UI/GUI               ; $(MAKE) depend
  	cd CPP/7zip/UI/FileManager       ; $(MAKE) depend
- 	cd check/my_86_filter            ; $(MAKE) depend
 @@ -68,7 +67,6 @@
  common7z:common
  	$(MKDIR) bin/Codecs
@@ -123,48 +888,15 @@ diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake
  	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/LzmaCon      ; $(MAKE) clean
  	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean
  	cd CPP/7zip/TEST/TestUI          ; $(MAKE) clean
-diff -Nur p7zip_9.20.1.orig/makefile.qnx_shared.so p7zip_9.20.1/makefile.qnx_shared.so
---- p7zip_9.20.1.orig/makefile.qnx_shared.so	2007-06-28 04:34:14.000000000 -0300
-+++ p7zip_9.20.1/makefile.qnx_shared.so	2014-05-03 11:19:47.618563272 -0300
+diff -Nur p7zip_9.38.orig/makefile.qnx_shared.so p7zip_9.38/makefile.qnx_shared.so
+--- p7zip_9.38.orig/makefile.qnx_shared.so	1989-12-31 22:00:00.000000000 -0200
++++ p7zip_9.38/makefile.qnx_shared.so	2015-02-11 00:19:25.384931200 -0200
 @@ -1,5 +1,4 @@
  ###################################################
 -# makefile.machine for "7z.so , Codecs/Rar29.so" :
  # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target
  
  OPTFLAGS=-O
-diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules
---- p7zip_9.20.1.orig/makefile.rules	2010-11-07 14:08:51.000000000 -0200
-+++ p7zip_9.20.1/makefile.rules	2014-05-03 11:19:47.621896630 -0300
-@@ -448,18 +448,6 @@
- NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp
- 	$(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp
- 
--RarHandler.o : ../../Archive/Rar/RarHandler.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp
--RarHeader.o : ../../Archive/Rar/RarHeader.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp
--RarIn.o : ../../Archive/Rar/RarIn.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp
--RarItem.o : ../../Archive/Rar/RarItem.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp
--RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp
--RarRegister.o : ../../Archive/Rar/RarRegister.cpp
--	$(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp
- 
- UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp
- 	$(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp
-@@ -535,10 +523,6 @@
- 	$(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp
- WzAes.o : ../../Crypto/WzAes.cpp
- 	$(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp
--Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp
--	$(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp
--RarAes.o : ../../Crypto/RarAes.cpp
--	$(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp
- HmacSha1.o : ../../Crypto/HmacSha1.cpp
- 	$(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp
- Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp
diff --git a/libre/p7zip/osversion.patch b/libre/p7zip/osversion.patch
new file mode 100644
index 000000000..49e0653e4
--- /dev/null
+++ b/libre/p7zip/osversion.patch
@@ -0,0 +1,28 @@
+diff -Naur old/CPP/7zip/UI/FileManager/FM.cpp new/CPP/7zip/UI/FileManager/FM.cpp
+--- old/CPP/7zip/UI/FileManager/FM.cpp	2015-01-18 08:59:09.000000000 -1000
++++ new/CPP/7zip/UI/FileManager/FM.cpp	2015-02-09 11:39:55.575712452 -1000
+@@ -348,24 +348,7 @@
+ 
+ bool IsLargePageSupported()
+ {
+-  #ifdef _WIN64
+   return true;
+-  #else
+-  OSVERSIONINFO versionInfo;
+-  versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
+-  if (!::GetVersionEx(&versionInfo))
+-    return false;
+-  if (versionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || versionInfo.dwMajorVersion < 5)
+-    return false;
+-  if (versionInfo.dwMajorVersion > 5)
+-    return true;
+-  if (versionInfo.dwMinorVersion < 1)
+-    return false;
+-  if (versionInfo.dwMinorVersion > 1)
+-    return true;
+-  // return IsWow64();
+-  return false;
+-  #endif
+ }
+ 
+ #if 0 //#ifndef UNDER_CE