--- a/components/p7zip/Makefile	Mon Jul 18 15:41:48 2011 -0700
+++ b/components/p7zip/Makefile	Mon Jul 18 15:47:25 2011 -0700
@@ -28,10 +28,10 @@
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
 COMPONENT_NAME=		p7zip
-COMPONENT_VERSION=	4.55
+COMPONENT_VERSION=	9.20.1
 COMPONENT_SRC=		$(COMPONENT_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)_src_all.tar.bz2
-COMPONENT_ARCHIVE_HASH=	sha1:7dd6f75c031f15f3d379af3e208e2e4d65f55bb7
+COMPONENT_ARCHIVE_HASH=	sha1:1cd567e043ee054bf08244ce15f32cb3258306b7
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/project/p7zip/p7zip/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/patches/compile.patch	Mon Jul 18 15:47:25 2011 -0700
@@ -0,0 +1,14 @@
+The "const" changes the function signature, preventing 7z.so from loading
+because of a missing symbol.
+
+--- p7zip_9.20.1/CPP/7zip/Archive/Wim/WimIn.cpp.orig	Mon Jul 18 14:37:02 2011
++++ p7zip_9.20.1/CPP/7zip/Archive/Wim/WimIn.cpp	Mon Jul 18 14:37:20 2011
+@@ -278,7 +278,7 @@
+ 
+ static const wchar_t *kLongPath = L"[LongPath]";
+ 
+-UString CDatabase::GetItemPath(const int index1) const
++UString CDatabase::GetItemPath(int index1) const
+ {
+   int size = 0;
+   int index = index1;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/patches/manpages.patch	Mon Jul 18 15:47:25 2011 -0700
@@ -0,0 +1,33 @@
+--- p7zip_9.20.1/man1/7z.1.orig	Fri Sep 21 11:53:12 2007
++++ p7zip_9.20.1/man1/7z.1	Mon Jul 18 14:50:22 2011
+@@ -11,7 +11,7 @@
+ .PP
+ .SH DESCRIPTION
+ 7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
+-.TP
++.PP
+ 7z uses plugins to handle archives.
+ .PP
+ .SH FUNCTION LETTERS
+--- p7zip_9.20.1/man1/7za.1.orig	Fri Sep 21 11:53:24 2007
++++ p7zip_9.20.1/man1/7za.1	Mon Jul 18 14:50:33 2011
+@@ -11,7 +11,7 @@
+ .PP
+ .SH DESCRIPTION
+ 7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
+-.TP
++.PP
+ 7za is a stand-alone executable. 7za handles less archive formats than 7z, but does not need any others.
+ .PP
+ .SH FUNCTION LETTERS
+--- p7zip_9.20.1/man1/7zr.1.orig	Fri Sep 21 11:53:33 2007
++++ p7zip_9.20.1/man1/7zr.1	Mon Jul 18 14:50:37 2011
+@@ -11,7 +11,7 @@
+ .PP
+ .SH DESCRIPTION
+ 7-Zip is a file archiver with the highest compression ratio. The program supports 7z (that implements LZMA compression algorithm), ZIP, CAB, ARJ, GZIP, BZIP2, TAR, CPIO, RPM and DEB formats. Compression ratio in the new 7z format is 30-50% better than ratio in ZIP format.
+-.TP
++.PP
+ 7zr is a stand-alone executable. 7zr handles less archive formats than 7z, but does not need any others. 7zr is a "light-version" of 7za that only handles 7z archives.
+ .PP
+ .SH FUNCTION LETTERS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/patches/pragmapack.patch	Mon Jul 18 15:47:25 2011 -0700
@@ -0,0 +1,24 @@
+The Studio compilers don't have support for a stack of structure packing,
+but we don't need full stack support here; just the original switch and
+back again.
+
+--- p7zip_9.20.1/C/Ppmd.h.orig	Sat Jan 22 11:32:30 2011
++++ p7zip_9.20.1/C/Ppmd.h	Mon Jul 18 11:38:47 2011
+@@ -29,7 +29,7 @@
+ #define PPMD_N4 ((128 + 3 - 1 * PPMD_N1 - 2 * PPMD_N2 - 3 * PPMD_N3) / 4)
+ #define PPMD_NUM_INDEXES (PPMD_N1 + PPMD_N2 + PPMD_N3 + PPMD_N4)
+ 
+-#pragma pack(push,1)
++#pragma pack(1)
+ 
+ /* SEE-contexts for PPM-contexts with masked symbols */
+ typedef struct
+@@ -50,7 +50,7 @@
+   UInt16 SuccessorHigh;
+ } CPpmd_State;
+ 
+-#pragma pack(pop)
++#pragma pack()
+ 
+ typedef
+   #ifdef PPMD_32BIT