Re: [UPDATE] archivers/p7zip to 16.02

[Jeremie Courreges-Anglas]

Josh Grosse  writes:

> This integrates the CVEs applied previously as patches.  Tested on amd64.

Committed, thanks.

-- 
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

[UPDATE] archivers/p7zip to 16.02

[Josh Grosse]

This integrates the CVEs applied previously as patches.  Tested on amd64.

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile30 May 2016 21:22:50 -  1.35
+++ Makefile15 Jul 2016 11:27:34 -
@@ -3,11 +3,10 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 15.14.1
+V= 16.02
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
-REVISION-main= 1
 PKGNAME-rar=   p7zip-rar-${V}
 CATEGORIES=archivers
 
Index: distinfo
===
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo10 Apr 2016 19:53:09 -  1.16
+++ distinfo15 Jul 2016 11:27:41 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_15.14.1_src_all.tar.bz2) = 
aZ202jYhkEET4EBwMiCrsRSN/vR3tVMF4vFKTx+PJdQ=
-SIZE (p7zip_15.14.1_src_all.tar.bz2) = 4147911
+SHA256 (p7zip_16.02_src_all.tar.bz2) = 
XrIKwOKUT2y5wtUd1sRRiUHBhTR9QInqiQh//dbiNB8=
+SIZE (p7zip_16.02_src_all.tar.bz2) = 4239909
Index: patches/patch-CPP_7zip_Archive_HfsHandler_cpp
===
RCS file: patches/patch-CPP_7zip_Archive_HfsHandler_cpp
diff -N patches/patch-CPP_7zip_Archive_HfsHandler_cpp
--- patches/patch-CPP_7zip_Archive_HfsHandler_cpp   30 May 2016 21:22:50 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-CPP_7zip_Archive_HfsHandler_cpp,v 1.1 2016/05/30 21:22:50 
sthen Exp $
-
-CVE-2016-2334
-
 CPP/7zip/Archive/HfsHandler.cpp.orig   Fri Jun 19 06:52:08 2015
-+++ CPP/7zip/Archive/HfsHandler.cppMon May 23 20:37:42 2016
-@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFork , cons
-   item.GroupID = Get32(r + 0x24);
-   item.AdminFlags = r[0x28];
-   item.OwnerFlags = r[0x29];
-+  */
-   item.FileMode = Get16(r + 0x2A);
-+  /*
-   item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount
-   item.FileType = Get32(r + 0x30);
-   item.FileCreator = Get32(r + 0x34);
-@@ -1571,6 +1573,9 @@ HRESULT CHandler::ExtractZlibFile(
-   blockSize = (UInt32)rem;
- 
- UInt32 size = GetUi32(tableBuf + i * 8 + 4);
-+
-+if (size > buf.Size() || size > kCompressionBlockSize + 1)
-+return S_FALSE;
- 
- RINOK(ReadStream_FALSE(inStream, buf, size));
- 
Index: patches/patch-CPP_7zip_Archive_Udf_UdfIn_cpp
===
RCS file: patches/patch-CPP_7zip_Archive_Udf_UdfIn_cpp
diff -N patches/patch-CPP_7zip_Archive_Udf_UdfIn_cpp
--- patches/patch-CPP_7zip_Archive_Udf_UdfIn_cpp30 May 2016 21:22:50 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-CPP_7zip_Archive_Udf_UdfIn_cpp,v 1.1 2016/05/30 21:22:50 sthen 
Exp $
-
-CVE-2016-2335
-
 CPP/7zip/Archive/Udf/UdfIn.cpp.origFri Nov 20 15:40:08 2015
-+++ CPP/7zip/Archive/Udf/UdfIn.cpp Mon May 23 20:37:46 2016
-@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int volIndex, int fsI
- return S_FALSE;
-   CFile  = Files.Back();
-   const CLogVol  = LogVols[volIndex];
--  CPartition  = 
Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex];
-+  unsigned partitionRef = lad.Location.PartitionRef;
-+
-+  if (partitionRef >= vol.PartitionMaps.Size())
-+  return S_FALSE;
-+  CPartition  = 
Partitions[vol.PartitionMaps[partitionRef].PartitionIndex];
- 
-   UInt32 key = lad.Location.Pos;
-   UInt32 value;
Index: patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
===
RCS file: 
/systems/cvs/ports/archivers/p7zip/patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
--- patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp31 Jan 2016 22:29:37 
-  1.2
+++ patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp15 Jul 2016 11:50:01 
-
@@ -2,8 +2,8 @@ $OpenBSD: patch-CPP_7zip_Bundles_SFXCon_
 
 Pledge self-extracting archives
 
 CPP/7zip/Bundles/SFXCon/SfxCon.cpp.origSat Sep  5 16:22:56 2015
-+++ CPP/7zip/Bundles/SFXCon/SfxCon.cpp Sun Jan 24 15:59:24 2016
+--- CPP/7zip/Bundles/SFXCon/SfxCon.cpp.origFri May 20 04:38:40 2016
 CPP/7zip/Bundles/SFXCon/SfxCon.cpp Fri Jul 15 07:49:33 2016
 @@ -250,6 +250,21 @@ int Main2(
#endif
  )
@@ -26,23 +26,24 @@ Pledge self-extracting archives
#if defined(_WIN32) && !defined(UNDER_CE)
SetFileApisToOEM();
#endif
-@@ -371,6 +386,19 @@ int Main2(
- HRESULT result = codecs->Load();
- if (result != S_OK)
-   throw CSystemException(result);
-+
+@@ -372,6 +387,20 @@ int Main2(
+   HRESULT result = codecs->Load();
+   if (result 

Re: update: archivers/p7zip

[Josh Grosse]

Repost of: http://marc.info/?l=openbsd-ports=145972542015059=2

-

Update: 15.09 -> 15.14.1

While here removes some trailing whitespace in pkg/DESCR-main noted 
by portcheck(1).

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile16 Mar 2016 16:46:31 -  1.32
+++ Makefile3 Apr 2016 22:53:43 -
@@ -3,8 +3,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 15.09
-REVISION=  4
+V= 15.14.1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo21 Oct 2015 10:45:08 -  1.15
+++ distinfo3 Apr 2016 22:54:28 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_15.09_src_all.tar.bz2) = 
h4Os90fiEOABUPcxHMBsTNjs97DCe0rfIZQoTMSbTW8=
-SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
+SHA256 (p7zip_15.14.1_src_all.tar.bz2) = 
aZ202jYhkEET4EBwMiCrsRSN/vR3tVMF4vFKTx+PJdQ=
+SIZE (p7zip_15.14.1_src_all.tar.bz2) = 4147911
Index: patches/patch-CPP_7zip_UI_Common_Bench_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Common_Bench_cpp
diff -N patches/patch-CPP_7zip_UI_Common_Bench_cpp
--- patches/patch-CPP_7zip_UI_Common_Bench_cpp  25 Jan 2016 19:42:46 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-CPP_7zip_UI_Common_Bench_cpp,v 1.1 2016/01/25 19:42:46 jasper 
Exp $
-
-Unbreak build on 'mips64' where 'mips' is a CPP define.
-../../../../CPP/7zip/UI/Common/Bench.cpp:2378: error: expected unqualified-id 
before numeric constant
-
 CPP/7zip/UI/Common/Bench.cpp.orig  Mon Jan 25 11:46:00 2016
-+++ CPP/7zip/UI/Common/Bench.cpp   Mon Jan 25 11:48:27 2016
-@@ -2375,18 +2375,18 @@ HRESULT Bench(
-   if (start == 0)
- start = 1;
-   UInt64 freq = GetFreq();
--  UInt64 mips = numMilCommands * freq / start;
-+  UInt64 mipsvalue = numMilCommands * freq / start;
-   if (printCallback)
--PrintNumber(*printCallback, mips, 5 + ((sum == 0xF1541213) ? 1 : 0));
-+PrintNumber(*printCallback, mipsvalue, 5 + ((sum == 0xF1541213) ? 1 : 
0));
- 
-   /*
-   if (benchCallback)
--benchCallback->AddCpuFreq(mips);
-+benchCallback->AddCpuFreq(mipsvalue);
-   */
- 
-   if (jj >= 3)
-   {
--SetComplexCommands(testTime, mips * 100, complexInCommands);
-+SetComplexCommands(testTime, mipsvalue * 100, complexInCommands);
- if (jj >= 8 || start >= freq)
-   break;
- // break; // change it
Index: patches/patch-C_CpuArch_h
===
RCS file: /systems/cvs/ports/archivers/p7zip/patches/patch-C_CpuArch_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-C_CpuArch_h
--- patches/patch-C_CpuArch_h   16 Nov 2015 22:52:08 -  1.1
+++ patches/patch-C_CpuArch_h   3 Apr 2016 23:06:00 -
@@ -2,30 +2,24 @@ $OpenBSD: patch-C_CpuArch_h,v 1.1 2015/1
 
 Add support for more OpenBSD architectures.
 
 C/CpuArch.h.orig   Sun Sep 27 21:31:20 2015
-+++ C/CpuArch.hThu Nov 12 00:28:15 2015
-@@ -65,7 +65,10 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
- || defined(__AARCH64EL__) \
+--- C/CpuArch.h.orig   Wed Feb 17 01:27:16 2016
 C/CpuArch.hSun Apr  3 19:05:55 2016
+@@ -66,6 +66,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and 
  || defined(__MIPSEL__) \
  || defined(__MIPSEL) \
--|| defined(_MIPSEL)
-+|| defined(_MIPSEL) \
+ || defined(_MIPSEL) \
 +|| defined(__alpha__) \
 +|| defined(__sh__) \
-+|| defined(__vax__)
+ || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == 
__ORDER_LITTLE_ENDIAN__))
#define MY_CPU_LE
  #endif
- 
-@@ -77,7 +80,11 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
- || defined(__MIPSEB) \
- || defined(_MIPSEB) \
- || defined(__m68k__) \
--|| defined(__s390x__)
-+|| defined(__m88k__) \
-+|| defined(__s390x__) \
+@@ -82,6 +84,9 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and 
+ || defined(__s390x__) \
+ || defined(__zarch__) \
+ || defined(__sparc) \
++|| defined(__sparc__) \
 +|| defined(__hppa__) \
 +|| defined(__mips64__) \
-+|| defined(__sparc__)
+ || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
#define MY_CPU_BE
  #endif
- 
Index: pkg/DESCR-main
===
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/DESCR-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-main
--- pkg/DESCR-main  20 Apr 2007 17:50:05 -  

update: archivers/p7zip

[Josh Grosse]

Update: 15.09 -> 15.14.1

While here removes some trailing whitespace in pkg/DESCR-main noted 
by portcheck(1).

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile16 Mar 2016 16:46:31 -  1.32
+++ Makefile3 Apr 2016 22:53:43 -
@@ -3,8 +3,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 15.09
-REVISION=  4
+V= 15.14.1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo21 Oct 2015 10:45:08 -  1.15
+++ distinfo3 Apr 2016 22:54:28 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_15.09_src_all.tar.bz2) = 
h4Os90fiEOABUPcxHMBsTNjs97DCe0rfIZQoTMSbTW8=
-SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
+SHA256 (p7zip_15.14.1_src_all.tar.bz2) = 
aZ202jYhkEET4EBwMiCrsRSN/vR3tVMF4vFKTx+PJdQ=
+SIZE (p7zip_15.14.1_src_all.tar.bz2) = 4147911
Index: patches/patch-CPP_7zip_UI_Common_Bench_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Common_Bench_cpp
diff -N patches/patch-CPP_7zip_UI_Common_Bench_cpp
--- patches/patch-CPP_7zip_UI_Common_Bench_cpp  25 Jan 2016 19:42:46 -  
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-CPP_7zip_UI_Common_Bench_cpp,v 1.1 2016/01/25 19:42:46 jasper 
Exp $
-
-Unbreak build on 'mips64' where 'mips' is a CPP define.
-../../../../CPP/7zip/UI/Common/Bench.cpp:2378: error: expected unqualified-id 
before numeric constant
-
 CPP/7zip/UI/Common/Bench.cpp.orig  Mon Jan 25 11:46:00 2016
-+++ CPP/7zip/UI/Common/Bench.cpp   Mon Jan 25 11:48:27 2016
-@@ -2375,18 +2375,18 @@ HRESULT Bench(
-   if (start == 0)
- start = 1;
-   UInt64 freq = GetFreq();
--  UInt64 mips = numMilCommands * freq / start;
-+  UInt64 mipsvalue = numMilCommands * freq / start;
-   if (printCallback)
--PrintNumber(*printCallback, mips, 5 + ((sum == 0xF1541213) ? 1 : 0));
-+PrintNumber(*printCallback, mipsvalue, 5 + ((sum == 0xF1541213) ? 1 : 
0));
- 
-   /*
-   if (benchCallback)
--benchCallback->AddCpuFreq(mips);
-+benchCallback->AddCpuFreq(mipsvalue);
-   */
- 
-   if (jj >= 3)
-   {
--SetComplexCommands(testTime, mips * 100, complexInCommands);
-+SetComplexCommands(testTime, mipsvalue * 100, complexInCommands);
- if (jj >= 8 || start >= freq)
-   break;
- // break; // change it
Index: patches/patch-C_CpuArch_h
===
RCS file: /systems/cvs/ports/archivers/p7zip/patches/patch-C_CpuArch_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-C_CpuArch_h
--- patches/patch-C_CpuArch_h   16 Nov 2015 22:52:08 -  1.1
+++ patches/patch-C_CpuArch_h   3 Apr 2016 23:06:00 -
@@ -2,30 +2,24 @@ $OpenBSD: patch-C_CpuArch_h,v 1.1 2015/1
 
 Add support for more OpenBSD architectures.
 
 C/CpuArch.h.orig   Sun Sep 27 21:31:20 2015
-+++ C/CpuArch.hThu Nov 12 00:28:15 2015
-@@ -65,7 +65,10 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
- || defined(__AARCH64EL__) \
+--- C/CpuArch.h.orig   Wed Feb 17 01:27:16 2016
 C/CpuArch.hSun Apr  3 19:05:55 2016
+@@ -66,6 +66,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and 
  || defined(__MIPSEL__) \
  || defined(__MIPSEL) \
--|| defined(_MIPSEL)
-+|| defined(_MIPSEL) \
+ || defined(_MIPSEL) \
 +|| defined(__alpha__) \
 +|| defined(__sh__) \
-+|| defined(__vax__)
+ || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == 
__ORDER_LITTLE_ENDIAN__))
#define MY_CPU_LE
  #endif
- 
-@@ -77,7 +80,11 @@ If MY_CPU_LE_UNALIGN is not defined, we don't know abo
- || defined(__MIPSEB) \
- || defined(_MIPSEB) \
- || defined(__m68k__) \
--|| defined(__s390x__)
-+|| defined(__m88k__) \
-+|| defined(__s390x__) \
+@@ -82,6 +84,9 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and 
+ || defined(__s390x__) \
+ || defined(__zarch__) \
+ || defined(__sparc) \
++|| defined(__sparc__) \
 +|| defined(__hppa__) \
 +|| defined(__mips64__) \
-+|| defined(__sparc__)
+ || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
#define MY_CPU_BE
  #endif
- 
Index: pkg/DESCR-main
===
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/DESCR-main,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-main
--- pkg/DESCR-main  20 Apr 2007 17:50:05 -  1.1.1.1
+++ pkg/DESCR-main  3 Apr 2016 23:12:45 -
@@ -1,10 

Re: [UPDATE] archivers/p7zip

[Josh Grosse]

On Wed, Feb 03, 2016 at 09:42:55AM +0300, Andre S wrote:
> p7zip-15.09p3
> 
> Core dumped when used "l" command to list contents of password protected
> archive.
> 
> Core dumped when used "t" command to test integrity of password protected
> archive.
> 
> $ 7z a -p test.7z test.txt
> Success.
> 
> $ 7z l test.7z
> Enter password (will not be echoed):Abort trap (core dumped)
> 
> $ 7z t test.7z
> Enter password (will not be echoed):Abort trap (core dumped)
 
Ouch. Thanks for the report. And for the fix, which broadens
the applicable secondary pledges to include tty.

In testing on amd64, I do get different results.  The list command 
does not prompt for a password.  

However the pledge() for list is also the pledge for stdout extractions, so 
your recommendation to expand that pledge is fine.  If you would be kind 
enough to post your architecture, that may be helpful in trying to recreate
the same results which occurred for you.

I was unable to apply your patch directly due to white space
alignment. I applied your recommendations and have posted the
equivalent patch below, using mutt, which is less likely to chew
on unified diffs than some other Email applications.

OK $MAINTAINER.

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile31 Jan 2016 22:29:37 -  1.30
+++ Makefile3 Feb 2016 11:21:33 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
-REVISION=  3
+REVISION=  4
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_UI_Console_Main_cpp
===
RCS file: 
/systems/cvs/ports/archivers/p7zip/patches/patch-CPP_7zip_UI_Console_Main_cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CPP_7zip_UI_Console_Main_cpp
--- patches/patch-CPP_7zip_UI_Console_Main_cpp  31 Jan 2016 22:29:37 -  
1.3
+++ patches/patch-CPP_7zip_UI_Console_Main_cpp  3 Feb 2016 11:22:33 -
@@ -88,7 +88,7 @@ Pledge archivers/p7zip main executables
 +#ifdef PLEDGE_DEBUG
 +  printf("reduced pledge: test stdout\n");
 +#endif
-+  if (pledge("stdio rpath", NULL) == -1) {
++  if (pledge("stdio rpath tty", NULL) == -1) {
 +  perror("pledge");
 +  exit(2);
 +}
@@ -106,7 +106,7 @@ Pledge archivers/p7zip main executables
 +  printf("reduced pledge: list\n");
 +#endif
 +
-+  if (pledge("stdio rpath", NULL) == -1) {
++  if (pledge("stdio rpath tty", NULL) == -1) {
 +perror("pledge");
 +exit(2);
 +  }

Re: [UPDATE] archivers/p7zip

[Josh Grosse]

On 2016-02-03 07:13, Theo Buehler wrote:

On Wed, Feb 03, 2016 at 06:43:41AM -0500, Josh Grosse wrote:

In testing on amd64, I do get different results.  The list command
does not prompt for a password.


Same here.  This is very odd behavior.  I would not expect a "password
protected" archive to reveal information about its content.


Indeed.  I can test on i386, and see if it has the same behavior.  If it
varies, I may be able to determine where the divergence takes place.
But I likely won't be able to get to this for a day or two.


I'm not sure if a maintainer ok is enough for me to commit it, so I
leave it at an

ok tb@


My OK has no authority whatsoever.  :)

Re: [UPDATE] archivers/p7zip

[Theo Buehler]

On Wed, Feb 03, 2016 at 06:43:41AM -0500, Josh Grosse wrote:
> In testing on amd64, I do get different results.  The list command
> does not prompt for a password.

Same here.  This is very odd behavior.  I would not expect a "password
protected" archive to reveal information about its content.

I'm not sure if a maintainer ok is enough for me to commit it, so I
leave it at an

ok tb@

Re: [UPDATE] archivers/p7zip

[Andre S]

On 02/03/16 14:43, Josh Grosse wrote:

On Wed, Feb 03, 2016 at 09:42:55AM +0300, Andre S wrote:

p7zip-15.09p3

Core dumped when used "l" command to list contents of password protected
archive.

Core dumped when used "t" command to test integrity of password protected
archive.

$ 7z a -p test.7z test.txt
Success.

$ 7z l test.7z
Enter password (will not be echoed):Abort trap (core dumped)

$ 7z t test.7z
Enter password (will not be echoed):Abort trap (core dumped)


Ouch. Thanks for the report. And for the fix, which broadens
the applicable secondary pledges to include tty.

In testing on amd64, I do get different results.  The list command
does not prompt for a password.

However the pledge() for list is also the pledge for stdout extractions, so
your recommendation to expand that pledge is fine.  If you would be kind
enough to post your architecture, that may be helpful in trying to recreate
the same results which occurred for you.


My architecture is amd64.

Sorry. I sent incomplete example.
I forgot to specify option -mhe=on (enables archive header encryption)

Correct example:

$ 7z a -p -mhe=on test.7z test.txt
Success.

$ 7z l test.7z
Enter password (will not be echoed):Abort trap (core dumped)

$ 7z t test.7z
Enter password (will not be echoed):Abort trap (core dumped)



I was unable to apply your patch directly due to white space
alignment. I applied your recommendations and have posted the
equivalent patch below, using mutt, which is less likely to chew
on unified diffs than some other Email applications.


Thanks. Thunderbird wrap long lines.

Re: [UPDATE] archivers/p7zip

[Dmitrij D. Czarkoff]

Theo Buehler said:
> I'm not sure if a maintainer ok is enough for me to commit it, so I
> leave it at an

According to my findings, p7zip uses getpass(3), which reads directly
from tty, so "tty" promise makes sense in contexts where password is
needed.

OK czarkoff@

-- 
Dmitrij D. Czarkoff

Re: [UPDATE] archivers/p7zip

[Andre S]

p7zip-15.09p3

Core dumped when used "l" command to list contents of password protected 
archive.


Core dumped when used "t" command to test integrity of password 
protected archive.


$ 7z a -p test.7z test.txt
Success.

$ 7z l test.7z
Enter password (will not be echoed):Abort trap (core dumped)

$ 7z t test.7z
Enter password (will not be echoed):Abort trap (core dumped)


Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile31 Jan 2016 22:29:37 -  1.30
+++ Makefile3 Feb 2016 06:39:00 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip

 V= 15.09
-REVISION=  3
+REVISION=  4
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_UI_Console_Main_cpp
===
RCS file: 
/cvs/ports/archivers/p7zip/patches/patch-CPP_7zip_UI_Console_Main_cpp,v

retrieving revision 1.3
diff -u -p -r1.3 patch-CPP_7zip_UI_Console_Main_cpp
--- patches/patch-CPP_7zip_UI_Console_Main_cpp	31 Jan 2016 22:29:37 
-	1.3

+++ patches/patch-CPP_7zip_UI_Console_Main_cpp  3 Feb 2016 06:39:00 -
@@ -88,7 +88,7 @@ Pledge archivers/p7zip main executables
 +#ifdef PLEDGE_DEBUG
 +  printf("reduced pledge: test stdout\n");
 +#endif
-+  if (pledge("stdio rpath", NULL) == -1) {
++  if (pledge("stdio rpath tty", NULL) == -1) {
 +  perror("pledge");
 +  exit(2);
 +}
@@ -106,7 +106,7 @@ Pledge archivers/p7zip main executables
 +  printf("reduced pledge: list\n");
 +#endif
 +
-+  if (pledge("stdio rpath", NULL) == -1) {
++  if (pledge("stdio rpath tty", NULL) == -1) {
 +perror("pledge");
 +exit(2);
 +  }

Re: [UPDATE] archivers/p7zip

[Andre S]

Core dumped when used switch "set Password" (-p)

7z a -p test.7z test.txt

Abort trap (core dumped)

Re: [UPDATE] archivers/p7zip

[Theo Buehler]

On Sun, Jan 31, 2016 at 05:05:55PM -0500, Josh Grosse wrote:
> On Sun, Jan 31, 2016 at 09:57:50PM +0100, Theo Buehler wrote:
> > On Sun, Jan 31, 2016 at 11:23:40PM +0300, Andre S wrote:
> > > Core dumped when used switch "set Password" (-p)
> > > 
> > > 7z a -p test.7z test.txt
> > > 
> > > Abort trap (core dumped)
> > > 
> > is a missing pledge "tty" for readpassphrase(3), but it's probably
> > easier for you to figure out where it should go and where it should be
> > dropped.
> > 
> > here's the backtrace
> 
> Thank you both!  A patch follows.
> 
> This permits tty for both standard and self-extracting archives.

This fixes the reported issue and looks reasaonable.

ok tb@

Re: [UPDATE] archivers/p7zip

[Theo Buehler]

On Sun, Jan 31, 2016 at 11:23:40PM +0300, Andre S wrote:
> Core dumped when used switch "set Password" (-p)
> 
> 7z a -p test.7z test.txt
> 
> Abort trap (core dumped)
> 
is a missing pledge "tty" for readpassphrase(3), but it's probably
easier for you to figure out where it should go and where it should be
dropped.

here's the backtrace
(gdb) bt
#0  0x17c8b172936a in ioctl () at :2
#1  0x17c8b16de96e in *_libc_readpassphrase (prompt=0x17c5e8a752ec "", 
buf=0x17c8b1b75da0 "", bufsiz=Variable "bufsiz" is not available.
)
at /usr/src/lib/libc/gen/readpassphrase.c:80
#2  0x17c5e89604a5 in GetPassword () from 
/usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
#3  0x17c5e895e903 in CUpdateCallbackConsole::CryptoGetTextPassword2 () 
from /usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
#4  0x17c5e894c3e2 in CArchiveUpdateCallback::CryptoGetTextPassword2 () 
from /usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
#5  0x17c8946ef96a in NArchive::N7z::CHandler::UpdateItems () from bin/7z.so
#6  0x17c5e8947d4f in Compress () from 
/usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
#7  0x17c5e8949e31 in UpdateArchive () from 
/usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
#8  0x17c5e895ae69 in Main2 () from 
/usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
#9  0x17c5e895d5f2 in main () from 
/usr/ports/pobj/p7zip-15.09/p7zip_15.09/bin/7z
Current language:  auto; currently asm
(gdb)

Re: [UPDATE] archivers/p7zip

[Josh Grosse]

On Sun, Jan 31, 2016 at 09:57:50PM +0100, Theo Buehler wrote:
> On Sun, Jan 31, 2016 at 11:23:40PM +0300, Andre S wrote:
> > Core dumped when used switch "set Password" (-p)
> > 
> > 7z a -p test.7z test.txt
> > 
> > Abort trap (core dumped)
> > 
> is a missing pledge "tty" for readpassphrase(3), but it's probably
> easier for you to figure out where it should go and where it should be
> dropped.
> 
> here's the backtrace

Thank you both!  A patch follows.

This permits tty for both standard and self-extracting archives.

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile27 Jan 2016 10:36:00 -  1.29
+++ Makefile31 Jan 2016 22:02:08 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
-REVISION=  2
+REVISION=  3
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
===
RCS file: 
/systems/cvs/ports/archivers/p7zip/patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
--- patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp27 Jan 2016 10:36:00 
-  1.1
+++ patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp31 Jan 2016 21:55:02 
-
@@ -15,7 +15,7 @@ Pledge self-extracting archives
 +  printf("pledge: 7za 7zr SFX\n");
 +#endif //PLEDGE_DEBUG
 +
-+  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++  if (pledge("stdio rpath wpath cpath fattr tty", NULL) == -1) {
 +perror("pledge");
 +exit(2);
 +  }
@@ -37,7 +37,7 @@ Pledge self-extracting archives
 +  printf("pledge: 7z SFX\n");
 +#endif //PLEDGE_DEBUG
 +
-+  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++  if (pledge("stdio rpath wpath cpath fattr tty", NULL) == -1) {
 +perror("pledge");
 +exit(2);
 +  }
Index: patches/patch-CPP_7zip_UI_Console_Main_cpp
===
RCS file: 
/systems/cvs/ports/archivers/p7zip/patches/patch-CPP_7zip_UI_Console_Main_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CPP_7zip_UI_Console_Main_cpp
--- patches/patch-CPP_7zip_UI_Console_Main_cpp  27 Jan 2016 10:36:00 -  
1.2
+++ patches/patch-CPP_7zip_UI_Console_Main_cpp  31 Jan 2016 21:54:38 -
@@ -15,7 +15,7 @@ Pledge archivers/p7zip main executables
 +  printf("initial pledge: 7za 7zr\n");
 +#endif
 +
-+  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++  if (pledge("stdio rpath wpath cpath fattr tty", NULL) == -1) {
 +perror("pledge");
 +exit(2);
 +  }
@@ -35,7 +35,7 @@ Pledge archivers/p7zip main executables
 +  printf("initial pledge: 7z\n");
 +#endif
 +
-+  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++  if (pledge("stdio rpath wpath cpath fattr tty", NULL) == -1) {
 +perror("pledge");
 +exit(2);
 +  }

Re: [UPDATE] archivers/p7zip

[Stuart Henderson]

On 2016/01/31 23:19, Theo Buehler wrote:
> On Sun, Jan 31, 2016 at 05:05:55PM -0500, Josh Grosse wrote:
> > On Sun, Jan 31, 2016 at 09:57:50PM +0100, Theo Buehler wrote:
> > > On Sun, Jan 31, 2016 at 11:23:40PM +0300, Andre S wrote:
> > > > Core dumped when used switch "set Password" (-p)
> > > > 
> > > > 7z a -p test.7z test.txt
> > > > 
> > > > Abort trap (core dumped)
> > > > 
> > > is a missing pledge "tty" for readpassphrase(3), but it's probably
> > > easier for you to figure out where it should go and where it should be
> > > dropped.
> > > 
> > > here's the backtrace
> > 
> > Thank you both!  A patch follows.
> > 
> > This permits tty for both standard and self-extracting archives.
> 
> This fixes the reported issue and looks reasaonable.
> 
> ok tb@
> 

Thanks all, I've committed this.

Re: [UPDATE] archivers/p7zip

[Josh Grosse]

On Sun, Jan 24, 2016 at 05:11:34PM -0500, Josh Grosse wrote:
> Additional pledge() calls added for Self-Extracting archives. These 
> use a separate executable, which has now been pledged.
> 
> Mitigation for CVE-2015-1038, which upstream has not implemented.
> This is Debian's proposed solution.  
> 
> Debug tokens added to pledge() patches.  Today, brynet@ proposed 
> several secondary pledges to reduce the pledge to stdio rpath,
> and in some cases possibly stdio alone.  These are still in 
> development.  
 
Testing is complete on the reduced pledges.

The test, hash, list, and extract to stdout (x -so) functions are 
pledged "stdio rpath", while the info and benchmark functions are
now pledged "stdio" only.

These were devised by brynet@, and I'm very grateful for the time
Bryan devoted to analyzing the appropriate pledge points.

Revised patches below.

   -Josh-


Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile22 Jan 2016 13:39:08 -  1.28
+++ Makefile25 Jan 2016 00:45:03 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
-REVISION=  1
+REVISION=  2
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
===
RCS file: patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
diff -N patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp24 Jan 2016 21:02:56 
-
@@ -0,0 +1,48 @@
+$OpenBSD$
+
+Pledge self-extracting archives
+
+--- CPP/7zip/Bundles/SFXCon/SfxCon.cpp.origSat Sep  5 16:22:56 2015
 CPP/7zip/Bundles/SFXCon/SfxCon.cpp Sun Jan 24 15:59:24 2016
+@@ -250,6 +250,21 @@ int Main2(
+   #endif
+ )
+ {
++
++#ifndef EXTERNAL_CODECS
++
++#ifdef PLEDGE_DEBUG
++  printf("pledge: 7za 7zr SFX\n");
++#endif //PLEDGE_DEBUG
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(2);
++  }
++
++#endif
++
++
+   #if defined(_WIN32) && !defined(UNDER_CE)
+   SetFileApisToOEM();
+   #endif
+@@ -371,6 +386,19 @@ int Main2(
+ HRESULT result = codecs->Load();
+ if (result != S_OK)
+   throw CSystemException(result);
++
++#ifdef EXTERNAL_CODECS
++
++#ifdef PLEDGE_DEBUG
++  printf("pledge: 7z SFX\n");
++#endif //PLEDGE_DEBUG
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(2);
++  }
++
++#endif
+ 
+ if (command.CommandType != NCommandType::kList)
+ {
Index: patches/patch-CPP_7zip_UI_Agent_Agent_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Agent_Agent_cpp
diff -N patches/patch-CPP_7zip_UI_Agent_Agent_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_UI_Agent_Agent_cpp   24 Jan 2016 18:24:54 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Adapted for p7zip 15.09 by Ismail Donmez:
+http://sourceforge.net/p/p7zip/discussion/383043/thread/53f8df4f/
+
+Author: Ben Hutchings 
+Description: Delay creation of symlinks to prevent arbitrary file writes 
(CVE-2015-1038)
+
+--- CPP/7zip/UI/Agent/Agent.cpp.orig   Thu Sep 17 15:02:35 2015
 CPP/7zip/UI/Agent/Agent.cppSun Jan 24 13:20:58 2016
+@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const UInt32 *indic
+   HRESULT result = _agentSpec->GetArchive()->Extract((),
+   realIndices.Size(), testMode, extractCallback);
+   if (result == S_OK)
+-result = extractCallbackSpec->SetDirsTimes();
++result = extractCallbackSpec->SetFinalAttribs();
+   return result;
+   COM_TRY_END
+ }
Index: patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp
diff -N patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp 24 Jan 2016 18:24:47 
-
@@ -0,0 +1,57 @@
+$OpenBSD$
+
+Adapted for p7zip 15.09 by Ismail Donmez:
+http://sourceforge.net/p/p7zip/discussion/383043/thread/53f8df4f/
+
+Author: Ben Hutchings 
+Description: Delay creation of symlinks to prevent arbitrary file writes 
(CVE-2015-1038)
+
+--- CPP/7zip/UI/Client7z/Client7z.cpp.orig Sat Oct 17 10:52:30 2015
 CPP/7zip/UI/Client7z/Client7z.cpp  Sun Jan 24 13:20:58 2016
+@@ -230,8 +230,11 @@ class CArchiveExtractCallback: (private)
+   COutFileStream *_outFileStreamSpec;
+   CMyComPtr _outFileStream;
+ 
++  CObjectVector _delayedSymLinks;
++
+ public:
+   void Init(IInArchive *archiveHandler, const FString );
++  HRESULT SetFinalAttribs();
+ 
+   UInt64 NumErrors;
+   

[UPDATE] archivers/p7zip

[Josh Grosse]

Additional pledge() calls added for Self-Extracting archives. These 
use a separate executable, which has now been pledged.

Mitigation for CVE-2015-1038, which upstream has not implemented.
This is Debian's proposed solution.  

Debug tokens added to pledge() patches.  Today, brynet@ proposed 
several secondary pledges to reduce the pledge to stdio rpath,
and in some cases possibly stdio alone.  These are still in 
development.  

---

My thanks to Bryan for brining the CVE to my attention, and for his 
efforts at further limiting the application.

   -Josh-


Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile22 Jan 2016 13:39:08 -  1.28
+++ Makefile24 Jan 2016 18:04:56 -
@@ -6,7 +6,7 @@ COMMENT-main=   file archiver with high co
 COMMENT-rar=   rar modules for p7zip
 
 V= 15.09
-REVISION=  1
+REVISION=  2
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
===
RCS file: patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
diff -N patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_Bundles_SFXCon_SfxCon_cpp24 Jan 2016 21:02:56 
-
@@ -0,0 +1,48 @@
+$OpenBSD$
+
+Pledge self-extracting archives
+
+--- CPP/7zip/Bundles/SFXCon/SfxCon.cpp.origSat Sep  5 16:22:56 2015
 CPP/7zip/Bundles/SFXCon/SfxCon.cpp Sun Jan 24 15:59:24 2016
+@@ -250,6 +250,21 @@ int Main2(
+   #endif
+ )
+ {
++
++#ifndef EXTERNAL_CODECS
++
++#ifdef PLEDGE_DEBUG
++  printf("pledge: 7za 7zr SFX\n");
++#endif //PLEDGE_DEBUG
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(2);
++  }
++
++#endif
++
++
+   #if defined(_WIN32) && !defined(UNDER_CE)
+   SetFileApisToOEM();
+   #endif
+@@ -371,6 +386,19 @@ int Main2(
+ HRESULT result = codecs->Load();
+ if (result != S_OK)
+   throw CSystemException(result);
++
++#ifdef EXTERNAL_CODECS
++
++#ifdef PLEDGE_DEBUG
++  printf("pledge: 7z SFX\n");
++#endif //PLEDGE_DEBUG
++
++  if (pledge("stdio rpath wpath cpath fattr", NULL) == -1) {
++perror("pledge");
++exit(2);
++  }
++
++#endif
+ 
+ if (command.CommandType != NCommandType::kList)
+ {
Index: patches/patch-CPP_7zip_UI_Agent_Agent_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Agent_Agent_cpp
diff -N patches/patch-CPP_7zip_UI_Agent_Agent_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_UI_Agent_Agent_cpp   24 Jan 2016 18:24:54 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Adapted for p7zip 15.09 by Ismail Donmez:
+http://sourceforge.net/p/p7zip/discussion/383043/thread/53f8df4f/
+
+Author: Ben Hutchings 
+Description: Delay creation of symlinks to prevent arbitrary file writes 
(CVE-2015-1038)
+
+--- CPP/7zip/UI/Agent/Agent.cpp.orig   Thu Sep 17 15:02:35 2015
 CPP/7zip/UI/Agent/Agent.cppSun Jan 24 13:20:58 2016
+@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const UInt32 *indic
+   HRESULT result = _agentSpec->GetArchive()->Extract((),
+   realIndices.Size(), testMode, extractCallback);
+   if (result == S_OK)
+-result = extractCallbackSpec->SetDirsTimes();
++result = extractCallbackSpec->SetFinalAttribs();
+   return result;
+   COM_TRY_END
+ }
Index: patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp
===
RCS file: patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp
diff -N patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CPP_7zip_UI_Client7z_Client7z_cpp 24 Jan 2016 18:24:47 
-
@@ -0,0 +1,57 @@
+$OpenBSD$
+
+Adapted for p7zip 15.09 by Ismail Donmez:
+http://sourceforge.net/p/p7zip/discussion/383043/thread/53f8df4f/
+
+Author: Ben Hutchings 
+Description: Delay creation of symlinks to prevent arbitrary file writes 
(CVE-2015-1038)
+
+--- CPP/7zip/UI/Client7z/Client7z.cpp.orig Sat Oct 17 10:52:30 2015
 CPP/7zip/UI/Client7z/Client7z.cpp  Sun Jan 24 13:20:58 2016
+@@ -230,8 +230,11 @@ class CArchiveExtractCallback: (private)
+   COutFileStream *_outFileStreamSpec;
+   CMyComPtr _outFileStream;
+ 
++  CObjectVector _delayedSymLinks;
++
+ public:
+   void Init(IInArchive *archiveHandler, const FString );
++  HRESULT SetFinalAttribs();
+ 
+   UInt64 NumErrors;
+   bool PasswordIsDefined;
+@@ -449,12 +452,24 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResu
+   }
+   _outFileStream.Release();
+   if (_extractMode && _processedFileInfo.AttribDefined)
+-SetFileAttrib(_diskFilePath, _processedFileInfo.Attrib);
++SetFileAttrib(_diskFilePath, 

[UPDATE] archivers/p7zip

[Josh Grosse]

Updated to 15.09.  Tested on amd64.

OK?


Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile16 Mar 2015 17:20:40 -  1.24
+++ Makefile20 Oct 2015 21:29:26 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.38.1
+V= 15.09
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -21,9 +21,8 @@ PERMIT_PACKAGE_CDROM-rar= no fee
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 
-WANTLIB=   m pthread stdc++
-WANTLIB-main=  ${WANTLIB} c
-WANTLIB-rar=   ${WANTLIB}
+WANTLIB-main=  m pthread stdc++ c
+WANTLIB-rar=
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=  .tar.bz2
Index: distinfo
===
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo16 Mar 2015 17:20:40 -  1.14
+++ distinfo20 Oct 2015 21:10:02 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.38.1_src_all.tar.bz2) = 
/VAZEJyaG/NK0yV9N6aFPq6BUf9QNF8KP/un2MX9uZU=
-SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
+SHA256 (p7zip_15.09_src_all.tar.bz2) = 
h4Os90fiEOABUPcxHMBsTNjs97DCe0rfIZQoTMSbTW8=
+SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
Index: patches/patch-install_sh
===
RCS file: /systems/cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-install_sh
--- patches/patch-install_sh16 Mar 2015 17:20:40 -  1.3
+++ patches/patch-install_sh20 Oct 2015 21:20:05 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-install_sh,v 1.3 2015/03/16 17:20:40 juanfra Exp $
 install.sh.origTue Feb 10 13:46:49 2015
-+++ install.sh Fri Feb 27 17:16:12 2015
-@@ -17,14 +17,14 @@ installShared()
+--- install.sh.origTue Oct 20 17:17:32 2015
 install.sh Tue Oct 20 17:19:39 2015
+@@ -16,14 +16,14 @@ installShared()
  }
  
  # global install
@@ -18,16 +18,16 @@ $OpenBSD: patch-install_sh,v 1.3 2015/03
  [ "$1" ] && DEST_BIN="$1"
  [ "$2" ] && DEST_SHARE="$2"
  [ "$3" ] && DEST_MAN="$3"
-@@ -175,11 +175,11 @@ fi
+@@ -177,11 +177,14 @@ fi
  
  if [ -d DOC ]
  then
 -  echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOC"
 +  echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
--  cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}/DOC"
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type d -exec chmod 555 {} \;
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type f -exec chmod 444 {} \;
+   cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}/DOC"
+   find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type d -exec chmod 755 {} \;
+   find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type f -exec chmod 644 {} \;
 +  cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}"
 +  find "${DEST_DIR}${DEST_SHARE_DOC}" -type d -exec chmod 555 {} \;
 +  find "${DEST_DIR}${DEST_SHARE_DOC}" -type f -exec chmod 444 {} \;
Index: pkg/PLIST-main
===
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main  16 Mar 2015 17:20:40 -  1.8
+++ pkg/PLIST-main  20 Oct 2015 21:29:51 -
@@ -9,6 +9,7 @@ lib/p7zip/7z.so
 @bin lib/p7zip/7za
 @bin lib/p7zip/7zr
 lib/p7zip/Codecs/
+lib/p7zip/Codecs/Rar.so
 @man man/man1/7z.1
 @man man/man1/7za.1
 @man man/man1/7zr.1
@@ -19,56 +20,86 @@ share/doc/p7zip/DOC/7zC.txt
 share/doc/p7zip/DOC/7zFormat.txt
 share/doc/p7zip/DOC/License.txt
 share/doc/p7zip/DOC/MANUAL/
-share/doc/p7zip/DOC/MANUAL/commands/
-share/doc/p7zip/DOC/MANUAL/commands/add.htm
-share/doc/p7zip/DOC/MANUAL/commands/bench.htm
-share/doc/p7zip/DOC/MANUAL/commands/delete.htm
-share/doc/p7zip/DOC/MANUAL/commands/extract.htm
-share/doc/p7zip/DOC/MANUAL/commands/extract_full.htm
-share/doc/p7zip/DOC/MANUAL/commands/hash.htm
-share/doc/p7zip/DOC/MANUAL/commands/index.htm
-share/doc/p7zip/DOC/MANUAL/commands/list.htm
-share/doc/p7zip/DOC/MANUAL/commands/rename.htm
-share/doc/p7zip/DOC/MANUAL/commands/style.css
-share/doc/p7zip/DOC/MANUAL/commands/test.htm
-share/doc/p7zip/DOC/MANUAL/commands/update.htm
-share/doc/p7zip/DOC/MANUAL/exit_codes.htm
-share/doc/p7zip/DOC/MANUAL/index.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm

Re: [UPDATE] archivers/p7zip

[Stuart Henderson]

On 2015/10/20 17:35, Josh Grosse wrote:
> Updated to 15.09.  Tested on amd64.

update-plist moved rar.so to the main package; you'll probably need
to reinstate the WANTLIBs after fixing that.

Re: [UPDATE] archivers/p7zip

[Josh Grosse]

On Tue, Oct 20, 2015 at 11:16:15PM +0100, Stuart Henderson wrote:
> On 2015/10/20 17:35, Josh Grosse wrote:
> > Updated to 15.09.  Tested on amd64.
> 
> update-plist moved rar.so to the main package; you'll probably need
> to reinstate the WANTLIBs after fixing that.
 
Thank you for catching that!  I've repaired, and took the opportunity
to move the directory creation into the subpackage PLIST while I was
correcting the error.

The reissued diff follows.  

Index: Makefile
===
RCS file: /systems/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile16 Mar 2015 17:20:40 -  1.24
+++ Makefile20 Oct 2015 23:59:31 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.38.1
+V= 15.09
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /systems/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo16 Mar 2015 17:20:40 -  1.14
+++ distinfo20 Oct 2015 21:10:02 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.38.1_src_all.tar.bz2) = 
/VAZEJyaG/NK0yV9N6aFPq6BUf9QNF8KP/un2MX9uZU=
-SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
+SHA256 (p7zip_15.09_src_all.tar.bz2) = 
h4Os90fiEOABUPcxHMBsTNjs97DCe0rfIZQoTMSbTW8=
+SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481
Index: patches/patch-install_sh
===
RCS file: /systems/cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.3
diff -u -p -r1.3 patch-install_sh
--- patches/patch-install_sh16 Mar 2015 17:20:40 -  1.3
+++ patches/patch-install_sh20 Oct 2015 21:20:05 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-install_sh,v 1.3 2015/03/16 17:20:40 juanfra Exp $
 install.sh.origTue Feb 10 13:46:49 2015
-+++ install.sh Fri Feb 27 17:16:12 2015
-@@ -17,14 +17,14 @@ installShared()
+--- install.sh.origTue Oct 20 17:17:32 2015
 install.sh Tue Oct 20 17:19:39 2015
+@@ -16,14 +16,14 @@ installShared()
  }
  
  # global install
@@ -18,16 +18,16 @@ $OpenBSD: patch-install_sh,v 1.3 2015/03
  [ "$1" ] && DEST_BIN="$1"
  [ "$2" ] && DEST_SHARE="$2"
  [ "$3" ] && DEST_MAN="$3"
-@@ -175,11 +175,11 @@ fi
+@@ -177,11 +177,14 @@ fi
  
  if [ -d DOC ]
  then
 -  echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOC"
 +  echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
--  cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}/DOC"
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type d -exec chmod 555 {} \;
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type f -exec chmod 444 {} \;
+   cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}/DOC"
+   find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type d -exec chmod 755 {} \;
+   find "${DEST_DIR}${DEST_SHARE_DOC}/DOC" -type f -exec chmod 644 {} \;
 +  cp -r DOC "${DEST_DIR}${DEST_SHARE_DOC}"
 +  find "${DEST_DIR}${DEST_SHARE_DOC}" -type d -exec chmod 555 {} \;
 +  find "${DEST_DIR}${DEST_SHARE_DOC}" -type f -exec chmod 444 {} \;
Index: pkg/PLIST-main
===
RCS file: /systems/cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main  16 Mar 2015 17:20:40 -  1.8
+++ pkg/PLIST-main  20 Oct 2015 23:57:57 -
@@ -8,7 +8,6 @@ lib/p7zip/7z.so
 @bin lib/p7zip/7zCon.sfx
 @bin lib/p7zip/7za
 @bin lib/p7zip/7zr
-lib/p7zip/Codecs/
 @man man/man1/7z.1
 @man man/man1/7za.1
 @man man/man1/7zr.1
@@ -19,56 +18,86 @@ share/doc/p7zip/DOC/7zC.txt
 share/doc/p7zip/DOC/7zFormat.txt
 share/doc/p7zip/DOC/License.txt
 share/doc/p7zip/DOC/MANUAL/
-share/doc/p7zip/DOC/MANUAL/commands/
-share/doc/p7zip/DOC/MANUAL/commands/add.htm
-share/doc/p7zip/DOC/MANUAL/commands/bench.htm
-share/doc/p7zip/DOC/MANUAL/commands/delete.htm
-share/doc/p7zip/DOC/MANUAL/commands/extract.htm
-share/doc/p7zip/DOC/MANUAL/commands/extract_full.htm
-share/doc/p7zip/DOC/MANUAL/commands/hash.htm
-share/doc/p7zip/DOC/MANUAL/commands/index.htm
-share/doc/p7zip/DOC/MANUAL/commands/list.htm
-share/doc/p7zip/DOC/MANUAL/commands/rename.htm
-share/doc/p7zip/DOC/MANUAL/commands/style.css
-share/doc/p7zip/DOC/MANUAL/commands/test.htm
-share/doc/p7zip/DOC/MANUAL/commands/update.htm
-share/doc/p7zip/DOC/MANUAL/exit_codes.htm
-share/doc/p7zip/DOC/MANUAL/index.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm
+share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm

[Update] archivers/p7zip

[Josh Grosse]

[Resent via gmail, as my own Email MSP seems to have difficulty dealing
 with greytrapping.]

This updates p7zip to 9.38.1.  Tested on i386 and amd64.


Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.23
diff -u -p -p -u -r1.23 Makefile
--- Makefile30 Oct 2014 23:42:19 -1.23
+++ Makefile27 Feb 2015 22:44:11 -
@@ -5,13 +5,11 @@ SHARED_ONLY=Yes
 COMMENT-main=file archiver with high compression ratio
 COMMENT-rar=rar modules for p7zip

-V=9.20.1
+V=9.38.1
 DISTNAME=p7zip_${V}_src_all
 PKGNAME=p7zip-${V}
 PKGNAME-main=p7zip-${V}
 PKGNAME-rar=p7zip-rar-${V}
-REVISION-main=1
-REVISION-rar=1
 CATEGORIES=archivers

 HOMEPAGE=http://sourceforge.net/projects/p7zip/
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.13
diff -u -p -p -u -r1.13 distinfo
--- distinfo4 Apr 2013 16:03:56 -1.13
+++ distinfo27 Feb 2015 22:44:11 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.20.1_src_all.tar.bz2) =
SVV+f/yggQD5/Gh/Tfxa6nA8ogdkDHbZ3ue2bwPLR4I=
-SIZE (p7zip_9.20.1_src_all.tar.bz2) = 3835235
+SHA256 (p7zip_9.38.1_src_all.tar.bz2) =
/VAZEJyaG/NK0yV9N6aFPq6BUf9QNF8KP/un2MX9uZU=
+SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
Index: patches/patch-install_sh
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-install_sh
--- patches/patch-install_sh10 Jun 2008 03:24:38 -1.2
+++ patches/patch-install_sh27 Feb 2015 22:44:11 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
 install.sh.origSun Mar  2 13:35:05 2008
-+++ install.shMon Jun  9 20:27:58 2008
-@@ -1,14 +1,14 @@
- #! /bin/sh
+--- install.sh.origTue Feb 10 13:46:49 2015
 install.shFri Feb 27 17:16:12 2015
+@@ -17,14 +17,14 @@ installShared()
+ }

  # global install
 -DEST_HOME=/usr/local
@@ -18,18 +18,19 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
  [ $1 ]  DEST_BIN=$1
  [ $2 ]  DEST_SHARE=$2
  [ $3 ]  DEST_MAN=$3
-@@ -163,10 +163,10 @@ fi
+@@ -175,11 +175,11 @@ fi

- if [ -d DOCS ]
+ if [ -d DOC ]
  then
--  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
+-  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOC
 +  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}
mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
--  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \;
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \;
-+  cp -r DOCS/* ${DEST_DIR}${DEST_SHARE_DOC}
+-  cp -r DOC ${DEST_DIR}${DEST_SHARE_DOC}/DOC
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOC -type d -exec chmod 555 {} \;
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOC -type f -exec chmod 444 {} \;
++  cp -r DOC ${DEST_DIR}${DEST_SHARE_DOC}
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type d -exec chmod 555 {} \;
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
  fi

+ use_lang=n
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -p -u -r1.7 PLIST-main
--- pkg/PLIST-main21 Mar 2011 12:54:17 -1.7
+++ pkg/PLIST-main27 Feb 2015 22:44:11 -
@@ -13,55 +13,66 @@ lib/p7zip/Codecs/
 @man man/man1/7za.1
 @man man/man1/7zr.1
 share/doc/p7zip/
-share/doc/p7zip/7zC.txt
-share/doc/p7zip/7zFormat.txt
 share/doc/p7zip/ChangeLog
-share/doc/p7zip/License.txt
-share/doc/p7zip/MANUAL/
-share/doc/p7zip/MANUAL/commands/
-share/doc/p7zip/MANUAL/commands/add.htm
-share/doc/p7zip/MANUAL/commands/bench.htm
-share/doc/p7zip/MANUAL/commands/delete.htm
-share/doc/p7zip/MANUAL/commands/extract.htm
-share/doc/p7zip/MANUAL/commands/extract_full.htm
-share/doc/p7zip/MANUAL/commands/index.htm
-share/doc/p7zip/MANUAL/commands/list.htm
-share/doc/p7zip/MANUAL/commands/style.css
-share/doc/p7zip/MANUAL/commands/test.htm
-share/doc/p7zip/MANUAL/commands/update.htm
-share/doc/p7zip/MANUAL/exit_codes.htm
-share/doc/p7zip/MANUAL/index.htm
-share/doc/p7zip/MANUAL/style.css
-share/doc/p7zip/MANUAL/switches/
-share/doc/p7zip/MANUAL/switches/ar_exclude.htm
-share/doc/p7zip/MANUAL/switches/ar_include.htm
-share/doc/p7zip/MANUAL/switches/ar_no.htm
-share/doc/p7zip/MANUAL/switches/charset.htm
-share/doc/p7zip/MANUAL/switches/exclude.htm
-share/doc/p7zip/MANUAL/switches/include.htm
-share/doc/p7zip/MANUAL/switches/index.htm
-share/doc/p7zip/MANUAL/switches/large_pages.htm
-share/doc/p7zip/MANUAL/switches/list_tech.htm
-share/doc/p7zip/MANUAL/switches/method.htm
-share/doc/p7zip/MANUAL/switches/output_dir.htm
-share/doc/p7zip/MANUAL/switches/overwrite.htm
-share/doc/p7zip/MANUAL/switches/password.htm

[UPDATE] archivers/p7zip

[Josh Grosse]

[Resent.  My Email MSP seems to have difficulty dealing
 with greytrapping.]

This updates p7zip to 9.38.1.  Tested on i386 and amd64.


Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.23
diff -u -p -p -u -r1.23 Makefile
--- Makefile30 Oct 2014 23:42:19 -  1.23
+++ Makefile27 Feb 2015 22:44:11 -
@@ -5,13 +5,11 @@ SHARED_ONLY=  Yes
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.20.1
+V= 9.38.1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
 PKGNAME-rar=   p7zip-rar-${V}
-REVISION-main= 1
-REVISION-rar=  1
 CATEGORIES=archivers
 
 HOMEPAGE=  http://sourceforge.net/projects/p7zip/
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.13
diff -u -p -p -u -r1.13 distinfo
--- distinfo4 Apr 2013 16:03:56 -   1.13
+++ distinfo27 Feb 2015 22:44:11 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.20.1_src_all.tar.bz2) = 
SVV+f/yggQD5/Gh/Tfxa6nA8ogdkDHbZ3ue2bwPLR4I=
-SIZE (p7zip_9.20.1_src_all.tar.bz2) = 3835235
+SHA256 (p7zip_9.38.1_src_all.tar.bz2) = 
/VAZEJyaG/NK0yV9N6aFPq6BUf9QNF8KP/un2MX9uZU=
+SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
Index: patches/patch-install_sh
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-install_sh
--- patches/patch-install_sh10 Jun 2008 03:24:38 -  1.2
+++ patches/patch-install_sh27 Feb 2015 22:44:11 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
 install.sh.origSun Mar  2 13:35:05 2008
-+++ install.sh Mon Jun  9 20:27:58 2008
-@@ -1,14 +1,14 @@
- #! /bin/sh
+--- install.sh.origTue Feb 10 13:46:49 2015
 install.sh Fri Feb 27 17:16:12 2015
+@@ -17,14 +17,14 @@ installShared()
+ }
  
  # global install
 -DEST_HOME=/usr/local
@@ -18,18 +18,19 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
  [ $1 ]  DEST_BIN=$1
  [ $2 ]  DEST_SHARE=$2
  [ $3 ]  DEST_MAN=$3
-@@ -163,10 +163,10 @@ fi
+@@ -175,11 +175,11 @@ fi
  
- if [ -d DOCS ]
+ if [ -d DOC ]
  then
--  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
+-  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOC
 +  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}
mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
--  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \;
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \;
-+  cp -r DOCS/* ${DEST_DIR}${DEST_SHARE_DOC}
+-  cp -r DOC ${DEST_DIR}${DEST_SHARE_DOC}/DOC
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOC -type d -exec chmod 555 {} \;
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOC -type f -exec chmod 444 {} \;
++  cp -r DOC ${DEST_DIR}${DEST_SHARE_DOC}
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type d -exec chmod 555 {} \;
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
  fi
  
+ use_lang=n
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -p -u -r1.7 PLIST-main
--- pkg/PLIST-main  21 Mar 2011 12:54:17 -  1.7
+++ pkg/PLIST-main  27 Feb 2015 22:44:11 -
@@ -13,55 +13,66 @@ lib/p7zip/Codecs/
 @man man/man1/7za.1
 @man man/man1/7zr.1
 share/doc/p7zip/
-share/doc/p7zip/7zC.txt
-share/doc/p7zip/7zFormat.txt
 share/doc/p7zip/ChangeLog
-share/doc/p7zip/License.txt
-share/doc/p7zip/MANUAL/
-share/doc/p7zip/MANUAL/commands/
-share/doc/p7zip/MANUAL/commands/add.htm
-share/doc/p7zip/MANUAL/commands/bench.htm
-share/doc/p7zip/MANUAL/commands/delete.htm
-share/doc/p7zip/MANUAL/commands/extract.htm
-share/doc/p7zip/MANUAL/commands/extract_full.htm
-share/doc/p7zip/MANUAL/commands/index.htm
-share/doc/p7zip/MANUAL/commands/list.htm
-share/doc/p7zip/MANUAL/commands/style.css
-share/doc/p7zip/MANUAL/commands/test.htm
-share/doc/p7zip/MANUAL/commands/update.htm
-share/doc/p7zip/MANUAL/exit_codes.htm
-share/doc/p7zip/MANUAL/index.htm
-share/doc/p7zip/MANUAL/style.css
-share/doc/p7zip/MANUAL/switches/
-share/doc/p7zip/MANUAL/switches/ar_exclude.htm
-share/doc/p7zip/MANUAL/switches/ar_include.htm
-share/doc/p7zip/MANUAL/switches/ar_no.htm
-share/doc/p7zip/MANUAL/switches/charset.htm
-share/doc/p7zip/MANUAL/switches/exclude.htm
-share/doc/p7zip/MANUAL/switches/include.htm
-share/doc/p7zip/MANUAL/switches/index.htm
-share/doc/p7zip/MANUAL/switches/large_pages.htm
-share/doc/p7zip/MANUAL/switches/list_tech.htm
-share/doc/p7zip/MANUAL/switches/method.htm
-share/doc/p7zip/MANUAL/switches/output_dir.htm
-share/doc/p7zip/MANUAL/switches/overwrite.htm

[UPDATE] archivers/p7zip

[Josh Grosse]

This updates p7zip to 9.38.1.  Tested on i386 and amd64.


Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.23
diff -u -p -p -u -r1.23 Makefile
--- Makefile30 Oct 2014 23:42:19 -  1.23
+++ Makefile27 Feb 2015 22:44:11 -
@@ -5,13 +5,11 @@ SHARED_ONLY=  Yes
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.20.1
+V= 9.38.1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
 PKGNAME-rar=   p7zip-rar-${V}
-REVISION-main= 1
-REVISION-rar=  1
 CATEGORIES=archivers
 
 HOMEPAGE=  http://sourceforge.net/projects/p7zip/
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.13
diff -u -p -p -u -r1.13 distinfo
--- distinfo4 Apr 2013 16:03:56 -   1.13
+++ distinfo27 Feb 2015 22:44:11 -
@@ -1,2 +1,2 @@
-SHA256 (p7zip_9.20.1_src_all.tar.bz2) = 
SVV+f/yggQD5/Gh/Tfxa6nA8ogdkDHbZ3ue2bwPLR4I=
-SIZE (p7zip_9.20.1_src_all.tar.bz2) = 3835235
+SHA256 (p7zip_9.38.1_src_all.tar.bz2) = 
/VAZEJyaG/NK0yV9N6aFPq6BUf9QNF8KP/un2MX9uZU=
+SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925
Index: patches/patch-install_sh
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -p -p -u -r1.2 patch-install_sh
--- patches/patch-install_sh10 Jun 2008 03:24:38 -  1.2
+++ patches/patch-install_sh27 Feb 2015 22:44:11 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
 install.sh.origSun Mar  2 13:35:05 2008
-+++ install.sh Mon Jun  9 20:27:58 2008
-@@ -1,14 +1,14 @@
- #! /bin/sh
+--- install.sh.origTue Feb 10 13:46:49 2015
 install.sh Fri Feb 27 17:16:12 2015
+@@ -17,14 +17,14 @@ installShared()
+ }
  
  # global install
 -DEST_HOME=/usr/local
@@ -18,18 +18,19 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
  [ $1 ]  DEST_BIN=$1
  [ $2 ]  DEST_SHARE=$2
  [ $3 ]  DEST_MAN=$3
-@@ -163,10 +163,10 @@ fi
+@@ -175,11 +175,11 @@ fi
  
- if [ -d DOCS ]
+ if [ -d DOC ]
  then
--  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
+-  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOC
 +  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}
mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
--  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \;
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \;
-+  cp -r DOCS/* ${DEST_DIR}${DEST_SHARE_DOC}
+-  cp -r DOC ${DEST_DIR}${DEST_SHARE_DOC}/DOC
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOC -type d -exec chmod 555 {} \;
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOC -type f -exec chmod 444 {} \;
++  cp -r DOC ${DEST_DIR}${DEST_SHARE_DOC}
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type d -exec chmod 555 {} \;
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
  fi
  
+ use_lang=n
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -p -u -r1.7 PLIST-main
--- pkg/PLIST-main  21 Mar 2011 12:54:17 -  1.7
+++ pkg/PLIST-main  27 Feb 2015 22:44:11 -
@@ -13,55 +13,66 @@ lib/p7zip/Codecs/
 @man man/man1/7za.1
 @man man/man1/7zr.1
 share/doc/p7zip/
-share/doc/p7zip/7zC.txt
-share/doc/p7zip/7zFormat.txt
 share/doc/p7zip/ChangeLog
-share/doc/p7zip/License.txt
-share/doc/p7zip/MANUAL/
-share/doc/p7zip/MANUAL/commands/
-share/doc/p7zip/MANUAL/commands/add.htm
-share/doc/p7zip/MANUAL/commands/bench.htm
-share/doc/p7zip/MANUAL/commands/delete.htm
-share/doc/p7zip/MANUAL/commands/extract.htm
-share/doc/p7zip/MANUAL/commands/extract_full.htm
-share/doc/p7zip/MANUAL/commands/index.htm
-share/doc/p7zip/MANUAL/commands/list.htm
-share/doc/p7zip/MANUAL/commands/style.css
-share/doc/p7zip/MANUAL/commands/test.htm
-share/doc/p7zip/MANUAL/commands/update.htm
-share/doc/p7zip/MANUAL/exit_codes.htm
-share/doc/p7zip/MANUAL/index.htm
-share/doc/p7zip/MANUAL/style.css
-share/doc/p7zip/MANUAL/switches/
-share/doc/p7zip/MANUAL/switches/ar_exclude.htm
-share/doc/p7zip/MANUAL/switches/ar_include.htm
-share/doc/p7zip/MANUAL/switches/ar_no.htm
-share/doc/p7zip/MANUAL/switches/charset.htm
-share/doc/p7zip/MANUAL/switches/exclude.htm
-share/doc/p7zip/MANUAL/switches/include.htm
-share/doc/p7zip/MANUAL/switches/index.htm
-share/doc/p7zip/MANUAL/switches/large_pages.htm
-share/doc/p7zip/MANUAL/switches/list_tech.htm
-share/doc/p7zip/MANUAL/switches/method.htm
-share/doc/p7zip/MANUAL/switches/output_dir.htm
-share/doc/p7zip/MANUAL/switches/overwrite.htm
-share/doc/p7zip/MANUAL/switches/password.htm
-share/doc/p7zip/MANUAL/switches/recurse.htm

Re: [Update] archivers/p7zip 9.20 - 9.20.1

[Josh Grosse]

On Tue, Mar 15, 2011 at 10:52:49AM -0400, Josh Grosse wrote:
 
 Am waiting on upstream for an answer.  There's an
 open problem report from a Linux user on this as well.  No response yet.

Upstream answered, with revision 9.20.1, which repaired the broken install.sh
script:

Version 9.20.1
==

  - #3211479 p7zip 9.20 - unsupported method with RAR files -  fixed
  install.sh installs again bin/Codecs/Rar29.so

--

Tested on i386, including -rar extraction:

--

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile15 Nov 2010 00:22:45 -  1.14
+++ Makefile19 Mar 2011 20:11:03 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.13
+V= 9.20.1
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -36,7 +36,7 @@
 WRKDIST=   ${WRKDIR}/p7zip_${V}
 
 USE_GMAKE= Yes
-USE_GROFF =Yes
+USE_GROFF= Yes
 MAKE_FILE= makefile
 MAKE_FLAGS=MYCC=${CC} MYCXX=${CXX} \
MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
@@ -46,7 +46,6 @@
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
-   cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
 
 do-install:
@cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo20 Jun 2010 15:54:35 -  1.11
+++ distinfo19 Mar 2011 20:00:49 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_9.13_src_all.tar.bz2) = jdtQU9s7HyaWQH0BvhRXeQ==
-RMD160 (p7zip_9.13_src_all.tar.bz2) = vrkYEzD036dapPRzxopGLHa3qxk=
-SHA1 (p7zip_9.13_src_all.tar.bz2) = gdoHKVYc4SPAqCZW7JagStW/pSI=
-SHA256 (p7zip_9.13_src_all.tar.bz2) = 
/JwPouq9Nn1q28PqB7swXb3B9ocX7qNiyMB0uRwD2SM=
-SIZE (p7zip_9.13_src_all.tar.bz2) = 3753579
+MD5 (p7zip_9.20.1_src_all.tar.bz2) = vWyq6lZ9wNmVyZDFzIg8iQ==
+RMD160 (p7zip_9.20.1_src_all.tar.bz2) = w/8t0SRZKCtG2aaKtK94AP9GA58=
+SHA1 (p7zip_9.20.1_src_all.tar.bz2) = HNVn4EPuBUvwgkTOFfMssyWDBrc=
+SHA256 (p7zip_9.20.1_src_all.tar.bz2) = 
SVV+f/yggQD5/Gh/Tfxa6nA8ogdkDHbZ3ue2bwPLR4I=
+SIZE (p7zip_9.20.1_src_all.tar.bz2) = 3835235
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -r1.6 PLIST-main
--- pkg/PLIST-main  30 Nov 2008 22:24:54 -  1.6
+++ pkg/PLIST-main  19 Mar 2011 20:27:29 -
@@ -40,6 +40,7 @@
 share/doc/p7zip/MANUAL/switches/exclude.htm
 share/doc/p7zip/MANUAL/switches/include.htm
 share/doc/p7zip/MANUAL/switches/index.htm
+share/doc/p7zip/MANUAL/switches/large_pages.htm
 share/doc/p7zip/MANUAL/switches/list_tech.htm
 share/doc/p7zip/MANUAL/switches/method.htm
 share/doc/p7zip/MANUAL/switches/output_dir.htm

Re: [Update] archivers/p7zip 9.20

[Giovanni Bechis]

On 03/14/11 00:19, Josh Grosse wrote:
 On Sun, Mar 13, 2011 at 09:49:24PM +, Stuart Henderson wrote:
 
 What happened with rar?
  
 Good catch!  I hadn't noticed this.  
 
Diff to add unrar support and to remove USE_GROFF (just a couple of
warnings).
 Cheers
  Giovanni
Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile15 Nov 2010 00:22:45 -  1.14
+++ Makefile15 Mar 2011 07:52:43 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.13
+V= 9.20
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -24,7 +24,7 @@ PERMIT_DISTFILES_CDROM=   no fee
 PERMIT_DISTFILES_FTP=  Yes 
 
 WANTLIB-main=  c m pthread stdc++
-WANTLIB-rar=   pthread
+WANTLIB-rar=   m stdc++ pthread
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=  .tar.bz2
@@ -36,7 +36,6 @@ RUN_DEPENDS-rar= ${BASE_PKGPATH},-main
 WRKDIST=   ${WRKDIR}/p7zip_${V}
 
 USE_GMAKE= Yes
-USE_GROFF =Yes
 MAKE_FILE= makefile
 MAKE_FLAGS=MYCC=${CC} MYCXX=${CXX} \
MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
@@ -46,7 +45,6 @@ REGRESS_TARGET=   all_test
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
-   cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
 
 do-install:
@cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo20 Jun 2010 15:54:35 -  1.11
+++ distinfo15 Mar 2011 07:52:43 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_9.13_src_all.tar.bz2) = jdtQU9s7HyaWQH0BvhRXeQ==
-RMD160 (p7zip_9.13_src_all.tar.bz2) = vrkYEzD036dapPRzxopGLHa3qxk=
-SHA1 (p7zip_9.13_src_all.tar.bz2) = gdoHKVYc4SPAqCZW7JagStW/pSI=
-SHA256 (p7zip_9.13_src_all.tar.bz2) = 
/JwPouq9Nn1q28PqB7swXb3B9ocX7qNiyMB0uRwD2SM=
-SIZE (p7zip_9.13_src_all.tar.bz2) = 3753579
+MD5 (p7zip_9.20_src_all.tar.bz2) = t7e8YAO4Hq8ClJJ4bhef2g==
+RMD160 (p7zip_9.20_src_all.tar.bz2) = q3Z1xMqHzoVazAWFUygIHBs2XRw=
+SHA1 (p7zip_9.20_src_all.tar.bz2) = yXbfRUPqlGplvD9ePU6bqkF+XxI=
+SHA256 (p7zip_9.20_src_all.tar.bz2) = 
Ysc78r2b6Cjhc8brEXIo0cnXxna893632ZAXGbyE6xM=
+SIZE (p7zip_9.20_src_all.tar.bz2) = 3836127
Index: patches/patch-install_sh
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.2
diff -u -p -r1.2 patch-install_sh
--- patches/patch-install_sh10 Jun 2008 03:24:38 -  1.2
+++ patches/patch-install_sh15 Mar 2011 07:52:43 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
 install.sh.origSun Mar  2 13:35:05 2008
-+++ install.sh Mon Jun  9 20:27:58 2008
-@@ -1,14 +1,14 @@
- #! /bin/sh
+--- install.sh.origWed Feb 23 21:00:34 2011
 install.sh Mon Mar 14 21:47:48 2011
+@@ -17,14 +17,14 @@ installShared()
+ }
  
  # global install
 -DEST_HOME=/usr/local
@@ -18,7 +18,21 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
  [ $1 ]  DEST_BIN=$1
  [ $2 ]  DEST_SHARE=$2
  [ $3 ]  DEST_MAN=$3
-@@ -163,10 +163,10 @@ fi
+@@ -103,6 +103,13 @@ then
+ chmod 555 ${DEST_DIR}${DEST_SHARE}/7z.so
+   fi
+ 
++  if [ -x bin/Codecs/Rar29.so ]
++  then
++mkdir ${DEST_DIR}${DEST_SHARE}/Codecs
++cp bin/Codecs/Rar29.so ${DEST_DIR}${DEST_SHARE}/Codecs/Rar29.so
++chmod 555 ${DEST_DIR}${DEST_SHARE}/Codecs/Rar29.so
++  fi
++
+ else
+   if [ -x bin/7za ]
+   then
+@@ -167,11 +174,11 @@ fi
  
  if [ -d DOCS ]
  then
@@ -33,3 +47,4 @@ $OpenBSD: patch-install_sh,v 1.2 2008/06
 +  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
  fi
  
+ use_lang=n
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main  30 Nov 2008 22:24:54 -  1.6
+++ pkg/PLIST-main  15 Mar 2011 07:52:43 -
@@ -40,6 +40,7 @@ share/doc/p7zip/MANUAL/switches/charset.
 share/doc/p7zip/MANUAL/switches/exclude.htm
 share/doc/p7zip/MANUAL/switches/include.htm
 share/doc/p7zip/MANUAL/switches/index.htm
+share/doc/p7zip/MANUAL/switches/large_pages.htm
 share/doc/p7zip/MANUAL/switches/list_tech.htm
 share/doc/p7zip/MANUAL/switches/method.htm
 share/doc/p7zip/MANUAL/switches/output_dir.htm

Re: [Update] archivers/p7zip 9.20

[Josh Grosse]

On Tue, Mar 15, 2011 at 08:47:12AM +0100, Giovanni Bechis wrote:

 Diff to add unrar support and to remove USE_GROFF (just a couple of
 warnings).

Thank you, Giovanni.  Am waiting on upstream for an answer.  There's an
open problem report from a Linux user on this as well.  No response yet.

[Update] archivers/p7zip 9.20

[Josh Grosse]

Tested on i386, no regressions

Changelog since 9.13, followed by patch:

Version 9.20


  - From Windows version of 7-zip 9.20, What's new after 7-Zip 4.65
(2009-02-03):
- 7-Zip now supports LZMA2 compression method.
- 7-Zip now can update solid .7z archives.
- 7-Zip now supports XZ archives.
- 7-Zip now supports PPMd compression in ZIP archives.
- 7-Zip now can unpack NTFS, FAT, VHD, MBR, APM, SquashFS, CramFS, MSLZ
archives.
- 7-Zip now can unpack GZip, BZip2, LZMA, XZ and TAR archives from stdin.
- 7-Zip now can unpack some TAR and ISO archives with incorrect headers.
- 7-Zip now supports files that are larger than 8 GB in TAR archives.
- NSIS and WIM support was improved.
- Partial parsing for EXE resources, SWF and FLV.
- The support for archives in installers was improved.
- 7-Zip now can stores NTFS file timestamps to ZIP archives.
- Speed optimizations in PPMd codec.
- Speed optimizations in CRC calculation code for Intel's Atom CPUs.
- New -scrc switch to calculate total CRC-32 during extracting / testing.
- 7-Zip File Manager now doesn't use temp files to open nested archives
stored without compression.
- Disk fragmentation problem for ZIP archives created by 7-Zip was fixed.
- Some bugs were fixed.
- New localizations: Hindi, Gujarati, Sanskrit, Tatar, Uyghur, Kazakh.
- Not in p7zip : Speed optimizations in AES code for Intel's 32nm CPUs.

Version 9.18

  - From Windows version of 7-zip 9.17
- Disk fragmentation problem for ZIP archives created by 7-Zip was fixed.
Notes: 7-Zip now uses 4 MB RAM buffer as file cache, when you create ZIP
archives.
It reduces the number of Move_File_Position and Write_to_File operations.

  - From Windows version of 7-zip 9.18
- 7-Zip now can unpack SquashFS and CramFS filesystem images.
- 7-Zip now can unpack some TAR and ISO archives with incorrect headers.
- Some bugs were fixed.

  - Some bugs were fixed in 7zG and 7zFM on MacOSX

Version 9.16

  - From Windows version of 7-zip 9.16
- 7-Zip now supports files that are larger than 8 GB in TAR archives.
- NSIS support was improved :
  - 7-Zip now supports BZip2 method in NSIS installers.
  - 7-Zip now can extract identical files from NSIS installers.
- Some bugs were fixed.
- New localizations: Hindi, Gujarati, Sanskrit.

  - From Windows version of 7-zip 9.15
- Some bugs were fixed.
- New localization: Tatar

  - From Windows version of 7-zip 9.14
- WIM support was improved. 7-Zip now can create WIM archives without
compression.

  - #3069545 kSignatureDummy? fixed


Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile15 Nov 2010 00:22:45 -  1.14
+++ Makefile13 Mar 2011 20:57:37 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 9.13
+V= 9.20
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -46,7 +46,6 @@
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
-   cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
 
 do-install:
@cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo20 Jun 2010 15:54:35 -  1.11
+++ distinfo13 Mar 2011 20:50:26 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_9.13_src_all.tar.bz2) = jdtQU9s7HyaWQH0BvhRXeQ==
-RMD160 (p7zip_9.13_src_all.tar.bz2) = vrkYEzD036dapPRzxopGLHa3qxk=
-SHA1 (p7zip_9.13_src_all.tar.bz2) = gdoHKVYc4SPAqCZW7JagStW/pSI=
-SHA256 (p7zip_9.13_src_all.tar.bz2) = 
/JwPouq9Nn1q28PqB7swXb3B9ocX7qNiyMB0uRwD2SM=
-SIZE (p7zip_9.13_src_all.tar.bz2) = 3753579
+MD5 (p7zip_9.20_src_all.tar.bz2) = t7e8YAO4Hq8ClJJ4bhef2g==
+RMD160 (p7zip_9.20_src_all.tar.bz2) = q3Z1xMqHzoVazAWFUygIHBs2XRw=
+SHA1 (p7zip_9.20_src_all.tar.bz2) = yXbfRUPqlGplvD9ePU6bqkF+XxI=
+SHA256 (p7zip_9.20_src_all.tar.bz2) = 
Ysc78r2b6Cjhc8brEXIo0cnXxna893632ZAXGbyE6xM=
+SIZE (p7zip_9.20_src_all.tar.bz2) = 3836127
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -r1.6 PLIST-main
--- pkg/PLIST-main  30 Nov 2008 22:24:54 -  1.6
+++ pkg/PLIST-main  13 Mar 2011 21:26:49 -
@@ -8,7 +8,6 @@
 @bin lib/p7zip/7zCon.sfx
 @bin lib/p7zip/7za
 @bin lib/p7zip/7zr
-lib/p7zip/Codecs/
 @man man/man1/7z.1
 @man man/man1/7za.1
 @man man/man1/7zr.1
@@ -40,6 +39,7 @@
 share/doc/p7zip/MANUAL/switches/exclude.htm
 share/doc/p7zip/MANUAL/switches/include.htm
 

Re: [Update] archivers/p7zip 9.20

[Stuart Henderson]

On 2011/03/13 17:39, Josh Grosse wrote:
 Index: pkg/PLIST-rar
 ===
 RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-rar,v
 retrieving revision 1.2
 diff -u -r1.2 PLIST-rar
 --- pkg/PLIST-rar 8 May 2007 17:59:15 -   1.2
 +++ pkg/PLIST-rar 13 Mar 2011 21:26:49 -
 @@ -1,3 +1,2 @@
  @comment $OpenBSD: PLIST-rar,v 1.2 2007/05/08 17:59:15 naddy Exp $
 -lib/p7zip/Codecs/Rar29.so
  share/doc/p7zip/unRarLicense.txt


What happened with rar?

Re: [Update] archivers/p7zip 9.20

[Josh Grosse]

On Sun, Mar 13, 2011 at 09:49:24PM +, Stuart Henderson wrote:

 What happened with rar?
 
Good catch!  I hadn't noticed this.  

Poking about, it appears that it is now an unsupported method, though there is 
nothing
in the changelog about it.  There still seems to be some code to support it,
but the library is not there any longer, and /usr/local/lib/p7zip/Codecs is now 
empty.

I'll ask upstream.  If unRar has been removed, I'll modify the Makefile to 
remove the
subpackaging.

  -Josh-

[UPDATE] archivers/p7zip

[Josh Grosse]

From version 4.65 to version 9.04.

Fixes, enhancements, and a change to version numbering  to match 7zip 
application.

No regressions on i386.

-
Changelog: 
--

Version 9.04 (Major bugfixes and Major enhancements) 


  - From Windows version of 7-zip 9.04 :
- 7-Zip now can update solid .7z archives.
- 7-Zip now supports LZMA2 compression method.
- 7-Zip now supports XZ archives.
- 7-Zip now can unpack NTFS, FAT, VHD and MBR archives.
- 7-Zip now can unpack GZip, BZip2, LZMA, XZ and TAR archives from stdin.
- New -scrc switch to calculate total CRC-32 during extracting / testing.
- Some bugs were fixed.

-

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile15 Feb 2009 08:02:19 -  1.10
+++ Makefile7 Jun 2009 18:47:55 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.65
+V= 9.04
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo15 Feb 2009 08:02:19 -  1.9
+++ distinfo7 Jun 2009 18:48:55 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.65_src_all.tar.bz2) = 947SMkNtyPi+JaL5XU5fmg==
-RMD160 (p7zip_4.65_src_all.tar.bz2) = F0kDLBbnxa+qebwSPbM9YazHnro=
-SHA1 (p7zip_4.65_src_all.tar.bz2) = mI9uxj6T5uwjSS/TnjtIpY/WldE=
-SHA256 (p7zip_4.65_src_all.tar.bz2) = 
aRzJQZpzqTSDGfWyw7omVUcb7gUsbH+leiJoAMiasH8=
-SIZE (p7zip_4.65_src_all.tar.bz2) = 2501418
+MD5 (p7zip_9.04_src_all.tar.bz2) = kZTr+aKzc10jau0AHeX2+A==
+RMD160 (p7zip_9.04_src_all.tar.bz2) = LZyvgd0/wDhEG+fh5ZKpcqERTfc=
+SHA1 (p7zip_9.04_src_all.tar.bz2) = ZDD806XhbQow8e6/NKCF5TcrgTs=
+SHA256 (p7zip_9.04_src_all.tar.bz2) = 
3fu2eVoUvKsfliIJb+k4XCObQ8P2qagNhQIYSfc4+as=
+SIZE (p7zip_9.04_src_all.tar.bz2) = 3759021

[Update] archivers/p7zip

[Josh Grosse]

From maintainer.  Regression tested on i386.  Attempts to submit
patches/patch-makefile_openbsd upstream continue to fail.

Upgrade from 4.61 to 4.65.  No announcement or publication of 4.62-4.64
at Sourceforge, though the changelog shows bugfixes for things in those
releases.  



Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile30 Nov 2008 22:24:54 -  1.9
+++ Makefile14 Feb 2009 20:54:14 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.61
+V= 4.65
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo30 Nov 2008 22:24:54 -  1.8
+++ distinfo14 Feb 2009 20:55:07 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.61_src_all.tar.bz2) = oBQIrE70licP+TbbITCbkg==
-RMD160 (p7zip_4.61_src_all.tar.bz2) = 9AEGdjSYejfELbRXIzagnZgI/YQ=
-SHA1 (p7zip_4.61_src_all.tar.bz2) = NyI/8fEt07oNP5W1Mb+9Afl0dT8=
-SHA256 (p7zip_4.61_src_all.tar.bz2) = 
zMMJxkEbPputxz8sPhwEadMz0JoeowSBxKa+B4Lb4GE=
-SIZE (p7zip_4.61_src_all.tar.bz2) = 2483533
+MD5 (p7zip_4.65_src_all.tar.bz2) = 947SMkNtyPi+JaL5XU5fmg==
+RMD160 (p7zip_4.65_src_all.tar.bz2) = F0kDLBbnxa+qebwSPbM9YazHnro=
+SHA1 (p7zip_4.65_src_all.tar.bz2) = mI9uxj6T5uwjSS/TnjtIpY/WldE=
+SHA256 (p7zip_4.65_src_all.tar.bz2) = 
aRzJQZpzqTSDGfWyw7omVUcb7gUsbH+leiJoAMiasH8=
+SIZE (p7zip_4.65_src_all.tar.bz2) = 2501418

Re: [Update] archivers/p7zip

[Brad]

On Saturday 14 February 2009 16:21:09 Josh Grosse wrote:
 Attempts to submit  patches/patch-makefile_openbsd upstream continue to
 fail.

With the way the patch is now I don't blame the author(s) at all. Until the 
build infrastructure has been changed so CC/CXX and CFLAGS/CXXFLAGS can be 
passed in directly then what is there is very much a ports specific patch.

Also having these defines does nothing on a BSD OS..

-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

UPDATE: archivers/p7zip

[Josh Grosse]

By maintainer.  No regressions on i386.

Applicable changes:

   LZMA supported for .zip archives.
   Improved password prompting for encrypted archives.
   UDF, XAR, DMG/HFS archives now supported for unpack.
   The -t switch now usable with list and extract commands.
   Timestamp bug fix for .zip and .rar archives.

   Other changes include linux or windows related fixes, and the addition
   of a GUI version (7zG), in the source but not part of the standard build.
   I have not bothered to include it, as it is experimintal and requires
   manual configuration and install.

 

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile10 Jun 2008 03:24:37 -  1.8
+++ Makefile30 Nov 2008 19:56:52 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.58
+V= 4.61
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo10 Jun 2008 03:24:37 -  1.7
+++ distinfo30 Nov 2008 19:57:19 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.58_src_all.tar.bz2) = MVsYQQLBfElW9TIY2XMiLQ==
-RMD160 (p7zip_4.58_src_all.tar.bz2) = LDGrZXJ13AHS0jxd4jJ9XuRvToo=
-SHA1 (p7zip_4.58_src_all.tar.bz2) = dSW7sS7JQYbp5A02FM39X29jyrY=
-SHA256 (p7zip_4.58_src_all.tar.bz2) = 
UjkVWbd4LSutRbeDV56pgl8oZwum8jT9DZJIrz6Cvt0=
-SIZE (p7zip_4.58_src_all.tar.bz2) = 1948207
+MD5 (p7zip_4.61_src_all.tar.bz2) = oBQIrE70licP+TbbITCbkg==
+RMD160 (p7zip_4.61_src_all.tar.bz2) = 9AEGdjSYejfELbRXIzagnZgI/YQ=
+SHA1 (p7zip_4.61_src_all.tar.bz2) = NyI/8fEt07oNP5W1Mb+9Afl0dT8=
+SHA256 (p7zip_4.61_src_all.tar.bz2) = 
zMMJxkEbPputxz8sPhwEadMz0JoeowSBxKa+B4Lb4GE=
+SIZE (p7zip_4.61_src_all.tar.bz2) = 2483533
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -r1.5 PLIST-main
--- pkg/PLIST-main  16 Dec 2007 11:22:29 -  1.5
+++ pkg/PLIST-main  30 Nov 2008 21:18:06 -
@@ -3,11 +3,11 @@
 bin/7za
 bin/7zr
 lib/p7zip/
-lib/p7zip/7z
[EMAIL PROTECTED] lib/p7zip/7z
 lib/p7zip/7z.so
-lib/p7zip/7zCon.sfx
-lib/p7zip/7za
-lib/p7zip/7zr
[EMAIL PROTECTED] lib/p7zip/7zCon.sfx
[EMAIL PROTECTED] lib/p7zip/7za
[EMAIL PROTECTED] lib/p7zip/7zr
 lib/p7zip/Codecs/
 @man man/man1/7z.1
 @man man/man1/7za.1

Re: UPDATE: archivers/p7zip

[Stuart Henderson]

On 2008/11/30 16:26, Josh Grosse wrote:
 By maintainer.  No regressions on i386.

or sparc64 or armish.

UPDATE: archivers/p7zip

[Josh Grosse]

From 4.57 to 4.58.  Corrected HOMEPAGE, too.

Regression tests run on i386 and amd64.

Changelog notes speed optimizations, bug fixes, utf8 support for .zip
filenames, .lzma unpack added. 

--

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile16 Dec 2007 11:22:29 -  1.7
+++ Makefile8 Jun 2008 16:01:05 -
@@ -5,14 +5,14 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.57
+V= 4.58
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
 PKGNAME-rar=   p7zip-rar-${V}
 CATEGORIES=archivers
 
-HOMEPAGE=  http://www.7-zip.org/
+HOMEPAGE=  http://sourceforge.net/projects/p7zip/
 
 MAINTAINER=Josh Grosse [EMAIL PROTECTED]
 
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo16 Dec 2007 11:22:29 -  1.6
+++ distinfo8 Jun 2008 15:41:57 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.57_src_all.tar.bz2) = dz942LKX64WGJmZ9TfqTxw==
-RMD160 (p7zip_4.57_src_all.tar.bz2) = r0BWO06thNE46f/wOiZ3VAxQ0p0=
-SHA1 (p7zip_4.57_src_all.tar.bz2) = 7aXePTVWfiYzNz2+YDE1J6ak2yc=
-SHA256 (p7zip_4.57_src_all.tar.bz2) = 
AOkjOG3VPVMqhjMdFpTq7uYmeDr6UD+R7fc3A1fgW1M=
-SIZE (p7zip_4.57_src_all.tar.bz2) = 1473608
+MD5 (p7zip_4.58_src_all.tar.bz2) = MVsYQQLBfElW9TIY2XMiLQ==
+RMD160 (p7zip_4.58_src_all.tar.bz2) = LDGrZXJ13AHS0jxd4jJ9XuRvToo=
+SHA1 (p7zip_4.58_src_all.tar.bz2) = dSW7sS7JQYbp5A02FM39X29jyrY=
+SHA256 (p7zip_4.58_src_all.tar.bz2) = 
UjkVWbd4LSutRbeDV56pgl8oZwum8jT9DZJIrz6Cvt0=
+SIZE (p7zip_4.58_src_all.tar.bz2) = 1948207
Index: patches/patch-install_sh
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-install_sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-install_sh
--- patches/patch-install_sh20 Apr 2007 17:50:05 -  1.1.1.1
+++ patches/patch-install_sh8 Jun 2008 15:52:31 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-install_sh,v 1.1.1.1 2007/04/20 17:50:05 steven Exp $
 install.sh.origTue Jun 27 23:09:12 2006
-+++ install.sh Wed Jan 10 19:27:47 2007
+--- install.sh.origSun Mar  2 08:35:05 2008
 install.sh Sun Jun  8 11:52:15 2008
 @@ -1,14 +1,14 @@
  #! /bin/sh
  
@@ -11,25 +11,25 @@
  # DEST_HOME=${HOME}/INSTALL/usr/local
  DEST_BIN=${DEST_HOME}/bin
  DEST_SHARE=${DEST_HOME}/lib/p7zip
- DEST_SHARE_DOC=${DEST_HOME}/share/doc/p7zip
  DEST_MAN=${DEST_HOME}/man
+ DEST_SHARE_DOC=${DEST_HOME}/share/doc/p7zip
 -DEST_DIR=
 +DEST_DIR=${DESTDIR}
- [ $1 ]  DEST_BIN=$1
- [ $2 ]  DEST_SHARE=$2
- [ $3 ]  DEST_MAN=$3
+ [ $1 ]  DEST_BIN=$1
+ [ $2 ]  DEST_SHARE=$2
+ [ $3 ]  DEST_MAN=$3
 @@ -163,10 +163,10 @@ fi
  
  if [ -d DOCS ]
  then
 -  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
 +  echo - installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}
-   mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
--  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \;
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \;
-+  cp -r DOCS/* ${DEST_DIR}${DEST_SHARE_DOC}
-+  find ${DEST_DIR}${DEST_SHARE_DOC} -type d -exec chmod 555 {} \;
-+  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
+   mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
+-  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \;
+-  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \;
++  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}
++  find ${DEST_DIR}${DEST_SHARE_DOC} -type d -exec chmod 555 {} \;
++  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
  fi
  
Index: patches/patch-makefile_openbsd
===
RCS file: /cvs/ports/archivers/p7zip/patches/patch-makefile_openbsd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-makefile_openbsd
--- patches/patch-makefile_openbsd  20 Apr 2007 17:50:05 -  1.1.1.1
+++ patches/patch-makefile_openbsd  8 Jun 2008 15:52:24 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-makefile_openbsd,v 1.1.1.1 2007/04/20 17:50:05 steven Exp $
 makefile.openbsd.orig  Fri May 19 19:52:42 2006
-+++ makefile.openbsd   Mon Apr 16 09:52:33 2007
-@@ -3,17 +3,17 @@
- # LITTLE_ENDIAN and BIG_ENDIAN are already defined by the system headers
+--- makefile.openbsd.orig  Wed Aug  8 05:15:29 2007
 makefile.openbsd   Sun Jun  8 11:50:18 2008
+@@ -2,17 +2,17 @@
+ # makefile for OpenBSD (x86, PPC, alpha ...)
  #
  
 -OPTFLAGS=-O
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving 

Re: UPDATE: archivers/p7zip

[Mike Erdely]

On Sat, Dec 15, 2007 at 10:25:15PM +, Stuart Henderson wrote:
 On 2007/12/15 15:05, Josh Grosse wrote:
  Updated: from 4.55 - 4.57, regression tested on i386 and amd64.
 
 No regressions on sparc64, I'm happy with this. Any ok's?

No regressions on macppc.  ok by me.

-ME

UPDATE: archivers/p7zip

[Josh Grosse]

Updated: from 4.55 - 4.57, regression tested on i386 and amd64.

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile4 Dec 2007 12:13:21 -   1.6
+++ Makefile15 Dec 2007 19:10:14 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.55
+V= 4.57
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo4 Dec 2007 12:13:21 -   1.5
+++ distinfo15 Dec 2007 19:10:33 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.55_src_all.tar.bz2) = uxQVKc8jdKLhVzXxVScxcg==
-RMD160 (p7zip_4.55_src_all.tar.bz2) = 0iRXJGHwS1OXbi5FptHDSqvaGNg=
-SHA1 (p7zip_4.55_src_all.tar.bz2) = fdb3XAMfFfPTea8+II4uTWX1W7c=
-SHA256 (p7zip_4.55_src_all.tar.bz2) = 
VgTCG0/sG3Pmv4tpsMP5ej8mnN2XXDvcXZYd5+2KCDU=
-SIZE (p7zip_4.55_src_all.tar.bz2) = 1487801
+MD5 (p7zip_4.57_src_all.tar.bz2) = dz942LKX64WGJmZ9TfqTxw==
+RMD160 (p7zip_4.57_src_all.tar.bz2) = r0BWO06thNE46f/wOiZ3VAxQ0p0=
+SHA1 (p7zip_4.57_src_all.tar.bz2) = 7aXePTVWfiYzNz2+YDE1J6ak2yc=
+SHA256 (p7zip_4.57_src_all.tar.bz2) = 
AOkjOG3VPVMqhjMdFpTq7uYmeDr6UD+R7fc3A1fgW1M=
+SIZE (p7zip_4.57_src_all.tar.bz2) = 1473608
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -r1.4 PLIST-main
--- pkg/PLIST-main  10 Sep 2007 10:52:40 -  1.4
+++ pkg/PLIST-main  15 Dec 2007 19:28:24 -
@@ -40,7 +40,6 @@
 share/doc/p7zip/MANUAL/switches/exclude.htm
 share/doc/p7zip/MANUAL/switches/include.htm
 share/doc/p7zip/MANUAL/switches/index.htm
-share/doc/p7zip/MANUAL/switches/large_pages.htm
 share/doc/p7zip/MANUAL/switches/list_tech.htm
 share/doc/p7zip/MANUAL/switches/method.htm
 share/doc/p7zip/MANUAL/switches/output_dir.htm

Re: UPDATE: archivers/p7zip

[Giovanni Bechis]

Josh Grosse wrote:
According to the project's change log, between 4.53 and 4.55 were performance 
improvements and bug fixes.



Works well @i386
 Giovanni

UPDATE: archivers/p7zip

[Josh Grosse]

According to the project's change log, between 4.53 and 4.55 were performance 
improvements and bug fixes.


Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile15 Sep 2007 10:14:33 -  1.5
+++ Makefile3 Dec 2007 22:47:36 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.53
+V= 4.55
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo10 Sep 2007 10:52:40 -  1.4
+++ distinfo3 Dec 2007 22:48:39 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.53_src_all.tar.bz2) = MxRQRj1XN7upbL6iEVq+iw==
-RMD160 (p7zip_4.53_src_all.tar.bz2) = IFuSDRQjgk5nW/qUKQwUEAJMN8o=
-SHA1 (p7zip_4.53_src_all.tar.bz2) = V3YCXknRTzFI0qm109BnuxnG10U=
-SHA256 (p7zip_4.53_src_all.tar.bz2) = 
Da9c6CDTocpZDrbu4mE3gVxryR2BPR0J/haLgvDdb10=
-SIZE (p7zip_4.53_src_all.tar.bz2) = 145
+MD5 (p7zip_4.55_src_all.tar.bz2) = uxQVKc8jdKLhVzXxVScxcg==
+RMD160 (p7zip_4.55_src_all.tar.bz2) = 0iRXJGHwS1OXbi5FptHDSqvaGNg=
+SHA1 (p7zip_4.55_src_all.tar.bz2) = fdb3XAMfFfPTea8+II4uTWX1W7c=
+SHA256 (p7zip_4.55_src_all.tar.bz2) = 
VgTCG0/sG3Pmv4tpsMP5ej8mnN2XXDvcXZYd5+2KCDU=
+SIZE (p7zip_4.55_src_all.tar.bz2) = 1487801

Re: UPDATE: archivers/p7zip

[Josh Grosse]

On Mon, Dec 03, 2007 at 07:56:36PM -0500, Josh Grosse wrote:
 According to the project's change log, between 4.53 and 4.55 were performance 
 improvements and bug fixes.

Neglected to mention: tested on i386 and amd64.

Re: UPDATE: archivers/p7zip

[Eric Faurot]

On Sun, 9 Sep 2007 01:13:56 -0400
Josh Grosse [EMAIL PROTECTED] wrote:

 From 4.49 to 4.53.
 
 It passes regression tests on i386. 

It passes on macppc too. I slightly edited the Makefile.
I can commit if I get oks.

Eric.


p7zip.diff
Description: Binary data

Re: UPDATE: archivers/p7zip

[Stuart Henderson]

On 2007/09/09 13:58, Eric Faurot wrote:
 On Sun, 9 Sep 2007 01:13:56 -0400
 Josh Grosse [EMAIL PROTECTED] wrote:
 
  From 4.49 to 4.53.
  
  It passes regression tests on i386. 
 
 It passes on macppc too.

and sparc64.

Since the Makefile is now copied anyway, might as well copy it to Makefile
and miss out MAKE_FILE=

I think I prefer it with PKGNAME= left in though, anyone else?

UPDATE: archivers/p7zip

[Josh Grosse]

From 4.49 to 4.53.

It passes regression tests on i386. 

Index: Makefile
===
RCS file: /home/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile29 May 2007 21:55:05 -  1.3
+++ Makefile9 Sep 2007 03:45:37 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.47
+V= 4.53
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -35,6 +35,7 @@
 
 WRKDIST=   ${WRKDIR}/p7zip_${V}
 
+USE_GMAKE= Yes
 MAKE_FILE= makefile
 MAKE_FLAGS=MYCC=${CC} MYCXX=${CXX} \
MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
@@ -44,6 +45,7 @@
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
+   cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
 
 do-install:
@cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===
RCS file: /home/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo29 May 2007 21:55:05 -  1.3
+++ distinfo9 Sep 2007 03:48:33 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.47_src_all.tar.bz2) = dvSGqogmOPHCWc2NgQrfbA==
-RMD160 (p7zip_4.47_src_all.tar.bz2) = e7dwrU9yG9wCQFLiTZxfuxvDwEw=
-SHA1 (p7zip_4.47_src_all.tar.bz2) = Voq/VXH+ksGHmP61gmBMD1VjprA=
-SHA256 (p7zip_4.47_src_all.tar.bz2) = 
eHEgloqm5x20SC7hD+YXJTlIv2qiMziiA89dbR4LWIw=
-SIZE (p7zip_4.47_src_all.tar.bz2) = 1477689
+MD5 (p7zip_4.53_src_all.tar.bz2) = MxRQRj1XN7upbL6iEVq+iw==
+RMD160 (p7zip_4.53_src_all.tar.bz2) = IFuSDRQjgk5nW/qUKQwUEAJMN8o=
+SHA1 (p7zip_4.53_src_all.tar.bz2) = V3YCXknRTzFI0qm109BnuxnG10U=
+SHA256 (p7zip_4.53_src_all.tar.bz2) = 
Da9c6CDTocpZDrbu4mE3gVxryR2BPR0J/haLgvDdb10=
+SIZE (p7zip_4.53_src_all.tar.bz2) = 145
Index: pkg/PLIST-main
===
RCS file: /home/cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main  29 May 2007 21:55:05 -  1.3
+++ pkg/PLIST-main  9 Sep 2007 05:09:46 -
@@ -48,6 +48,7 @@
 share/doc/p7zip/MANUAL/switches/password.htm
 share/doc/p7zip/MANUAL/switches/recurse.htm
 share/doc/p7zip/MANUAL/switches/sfx.htm
+share/doc/p7zip/MANUAL/switches/ssc.htm
 share/doc/p7zip/MANUAL/switches/stdin.htm
 share/doc/p7zip/MANUAL/switches/stdout.htm
 share/doc/p7zip/MANUAL/switches/stop_switch.htm

Re: UPDATE: archivers/p7zip

[Josh Grosse]

On Mon, Jul 23, 2007 at 10:09:11AM +0200, Simon Bertrang wrote:
 On Sun, Jul 22, 2007 at 04:01:36PM -0400, Josh Grosse wrote:
  From 4.47 to 4.49.
  
  This could use some testing on !i386.
  
 
 No regressions on amd64.

I do not understand your comment.  What do you mean?  After seeing your
post, I installed an amd64 snapshot from 21 July, and have conducted a 
completely successful regression test.  The snapshot used was: 

OpenBSD 4.1-current (GENERIC) #1142: Sat Jul 21 14:27:16 MDT 2007
[EMAIL PROTECTED]:/usr/src/sys/arch/amd64/compile/GENERIC

Output from script(1) is available from http://jggimi.homeip.net/p7zip.amd64

Re: UPDATE: archivers/p7zip

[Stuart Henderson]

On 2007/07/24 20:57, Josh Grosse wrote:
 On Mon, Jul 23, 2007 at 10:09:11AM +0200, Simon Bertrang wrote:
  On Sun, Jul 22, 2007 at 04:01:36PM -0400, Josh Grosse wrote:
   From 4.47 to 4.49.
   
   This could use some testing on !i386.
  
  No regressions on amd64.
 
 I do not understand your comment.  What do you mean?

'no regressions' - the regression test reports no problems.

Re: UPDATE: archivers/p7zip

[Stuart Henderson]

On 2007/07/22 16:01, Josh Grosse wrote:
 This could use some testing on !i386.

ok on sparc64.

Re: UPDATE: archivers/p7zip

[Simon Bertrang]

On Sun, Jul 22, 2007 at 04:01:36PM -0400, Josh Grosse wrote:
 From 4.47 to 4.49.
 
 This could use some testing on !i386.
 

No regressions on amd64.

 Index: Makefile
 ===
 RCS file: /home/cvs/ports/archivers/p7zip/Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile
 --- Makefile  29 May 2007 21:55:05 -  1.3
 +++ Makefile  22 Jul 2007 19:44:58 -
 @@ -5,7 +5,7 @@
  COMMENT-main=file archiver with high compression ratio
  COMMENT-rar= rar modules for p7zip
  
 -V=   4.47
 +V=   4.49
  DISTNAME=p7zip_${V}_src_all
  PKGNAME= p7zip-${V}
  PKGNAME-main=p7zip-${V}
 @@ -35,6 +35,7 @@
  
  WRKDIST= ${WRKDIR}/p7zip_${V}
  
 +USE_GMAKE=   Yes
  MAKE_FILE=   makefile
  MAKE_FLAGS=  MYCC=${CC} MYCXX=${CXX} \
   MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
 @@ -44,6 +45,7 @@
  
  do-configure:
   cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
 + cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
  
  do-install:
   @cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
 Index: distinfo
 ===
 RCS file: /home/cvs/ports/archivers/p7zip/distinfo,v
 retrieving revision 1.3
 diff -u -r1.3 distinfo
 --- distinfo  29 May 2007 21:55:05 -  1.3
 +++ distinfo  22 Jul 2007 19:45:40 -
 @@ -1,5 +1,5 @@
 -MD5 (p7zip_4.47_src_all.tar.bz2) = dvSGqogmOPHCWc2NgQrfbA==
 -RMD160 (p7zip_4.47_src_all.tar.bz2) = e7dwrU9yG9wCQFLiTZxfuxvDwEw=
 -SHA1 (p7zip_4.47_src_all.tar.bz2) = Voq/VXH+ksGHmP61gmBMD1VjprA=
 -SHA256 (p7zip_4.47_src_all.tar.bz2) = 
 eHEgloqm5x20SC7hD+YXJTlIv2qiMziiA89dbR4LWIw=
 -SIZE (p7zip_4.47_src_all.tar.bz2) = 1477689
 +MD5 (p7zip_4.49_src_all.tar.bz2) = QqN1rg794i2SSrThz/HShg==
 +RMD160 (p7zip_4.49_src_all.tar.bz2) = GGps/l9JnxnPR1rqYByBJj2+QaY=
 +SHA1 (p7zip_4.49_src_all.tar.bz2) = AEnflsmzXpBDk6/qUrhnC7G+4io=
 +SHA256 (p7zip_4.49_src_all.tar.bz2) = 
 eIKTacmVU+2jnX+YrWS/G4fSHM8M0iTMdfmnFkKX3Dk=
 +SIZE (p7zip_4.49_src_all.tar.bz2) = 1492155
 

UPDATE: archivers/p7zip

[Josh Grosse]

From 4.47 to 4.49.

This could use some testing on !i386.

Index: Makefile
===
RCS file: /home/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile29 May 2007 21:55:05 -  1.3
+++ Makefile22 Jul 2007 19:44:58 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.47
+V= 4.49
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -35,6 +35,7 @@
 
 WRKDIST=   ${WRKDIR}/p7zip_${V}
 
+USE_GMAKE= Yes
 MAKE_FILE= makefile
 MAKE_FLAGS=MYCC=${CC} MYCXX=${CXX} \
MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
@@ -44,6 +45,7 @@
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
+   cp ${WRKSRC}/makefile.parallel_jobs ${WRKSRC}/makefile
 
 do-install:
@cd ${WRKBUILD}  ${SETENV} ${MAKE_ENV} PREFIX=${TRUEPREFIX} \
Index: distinfo
===
RCS file: /home/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo29 May 2007 21:55:05 -  1.3
+++ distinfo22 Jul 2007 19:45:40 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.47_src_all.tar.bz2) = dvSGqogmOPHCWc2NgQrfbA==
-RMD160 (p7zip_4.47_src_all.tar.bz2) = e7dwrU9yG9wCQFLiTZxfuxvDwEw=
-SHA1 (p7zip_4.47_src_all.tar.bz2) = Voq/VXH+ksGHmP61gmBMD1VjprA=
-SHA256 (p7zip_4.47_src_all.tar.bz2) = 
eHEgloqm5x20SC7hD+YXJTlIv2qiMziiA89dbR4LWIw=
-SIZE (p7zip_4.47_src_all.tar.bz2) = 1477689
+MD5 (p7zip_4.49_src_all.tar.bz2) = QqN1rg794i2SSrThz/HShg==
+RMD160 (p7zip_4.49_src_all.tar.bz2) = GGps/l9JnxnPR1rqYByBJj2+QaY=
+SHA1 (p7zip_4.49_src_all.tar.bz2) = AEnflsmzXpBDk6/qUrhnC7G+4io=
+SHA256 (p7zip_4.49_src_all.tar.bz2) = 
eIKTacmVU+2jnX+YrWS/G4fSHM8M0iTMdfmnFkKX3Dk=
+SIZE (p7zip_4.49_src_all.tar.bz2) = 1492155

Re: UPDATE: archivers/p7zip

[Stuart Henderson]

On 2007/05/28 23:33, Josh Grosse wrote:
 This is bugfix release 4.47.
 Tested on i386 and amd64.  

Passes 'make regress' on sparc64

UPDATE: archivers/p7zip

[Josh Grosse]

This is bugfix release 4.47.

Tested on i386 and amd64.  

Port changed slightly: make regress now uses target all_test, which
tests 7z, 7za, 7zr, and the self-extractor.

Index: Makefile
===
RCS file: /home/cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile8 May 2007 17:59:15 -   1.2
+++ Makefile29 May 2007 03:17:34 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.45
+V= 4.47
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
@@ -40,7 +40,7 @@
MYCFLAGS=${CFLAGS} MYCXXFLAGS=${CXXFLAGS}
 
 ALL_TARGET=all3
-REGRESS_TARGET=test
+REGRESS_TARGET=all_test
 
 do-configure:
cp ${WRKSRC}/makefile.openbsd ${WRKSRC}/makefile.machine
Index: distinfo
===
RCS file: /home/cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo8 May 2007 17:59:15 -   1.2
+++ distinfo28 May 2007 18:08:58 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.45_src_all.tar.bz2) = t+t6krG/DnOi/q6VzTGE9w==
-RMD160 (p7zip_4.45_src_all.tar.bz2) = I2d/QeGiwdjCVAc7wX6kDqkIUfE=
-SHA1 (p7zip_4.45_src_all.tar.bz2) = Br2vdV4ohTnaTvo5n8FDZI21es0=
-SHA256 (p7zip_4.45_src_all.tar.bz2) = 
OikC1TKnZzETYJIytGyGjmxV284Ofvc9jvlE+ylceYQ=
-SIZE (p7zip_4.45_src_all.tar.bz2) = 1458299
+MD5 (p7zip_4.47_src_all.tar.bz2) = dvSGqogmOPHCWc2NgQrfbA==
+RMD160 (p7zip_4.47_src_all.tar.bz2) = e7dwrU9yG9wCQFLiTZxfuxvDwEw=
+SHA1 (p7zip_4.47_src_all.tar.bz2) = Voq/VXH+ksGHmP61gmBMD1VjprA=
+SHA256 (p7zip_4.47_src_all.tar.bz2) = 
eHEgloqm5x20SC7hD+YXJTlIv2qiMziiA89dbR4LWIw=
+SIZE (p7zip_4.47_src_all.tar.bz2) = 1477689
Index: pkg/PLIST-main
===
RCS file: /home/cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -r1.2 PLIST-main
--- pkg/PLIST-main  8 May 2007 17:59:15 -   1.2
+++ pkg/PLIST-main  28 May 2007 18:18:31 -
@@ -4,6 +4,7 @@
 bin/7zr
 lib/p7zip/
 lib/p7zip/7z
+lib/p7zip/7z.so
 lib/p7zip/7zCon.sfx
 lib/p7zip/7za
 lib/p7zip/7zr
@@ -36,7 +37,6 @@
 share/doc/p7zip/MANUAL/switches/ar_include.htm
 share/doc/p7zip/MANUAL/switches/ar_no.htm
 share/doc/p7zip/MANUAL/switches/charset.htm
-share/doc/p7zip/MANUAL/switches/email.htm
 share/doc/p7zip/MANUAL/switches/exclude.htm
 share/doc/p7zip/MANUAL/switches/include.htm
 share/doc/p7zip/MANUAL/switches/index.htm

UPDATE: archivers/p7zip

[Josh Grosse]

The sourceforge team has integrated 
patch-CPP_myWindows_myGetNumberOfProcessors_cpp into this bugfix update.

Stuart Henderson developed the original patch for sparc64, and tested 4.45 on
that arch.  I tested on i386.

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile20 Apr 2007 17:50:05 -  1.1.1.1
+++ Makefile1 May 2007 06:57:39 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.44
+V= 4.45
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo20 Apr 2007 17:50:05 -  1.1.1.1
+++ distinfo1 May 2007 06:57:39 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.44_src_all.tar.bz2) = eLBL7Rah5+kbW/Lx+Eq4EQ==
-RMD160 (p7zip_4.44_src_all.tar.bz2) = oE8TxVziF4HEY968V4/UgZ8XGt8=
-SHA1 (p7zip_4.44_src_all.tar.bz2) = R04keafOsZ/PdeYXhOLE7PLS9+c=
-SHA256 (p7zip_4.44_src_all.tar.bz2) = 
y4cwT2gucXarlc5z084re2U4TgUScvw075NOJCe7068=
-SIZE (p7zip_4.44_src_all.tar.bz2) = 1518820
+MD5 (p7zip_4.45_src_all.tar.bz2) = t+t6krG/DnOi/q6VzTGE9w==
+RMD160 (p7zip_4.45_src_all.tar.bz2) = I2d/QeGiwdjCVAc7wX6kDqkIUfE=
+SHA1 (p7zip_4.45_src_all.tar.bz2) = Br2vdV4ohTnaTvo5n8FDZI21es0=
+SHA256 (p7zip_4.45_src_all.tar.bz2) = 
OikC1TKnZzETYJIytGyGjmxV284Ofvc9jvlE+ylceYQ=
+SIZE (p7zip_4.45_src_all.tar.bz2) = 1458299
Index: patches/patch-CPP_myWindows_myGetNumberOfProcessors_cpp
===
RCS file: patches/patch-CPP_myWindows_myGetNumberOfProcessors_cpp
diff -N patches/patch-CPP_myWindows_myGetNumberOfProcessors_cpp
--- patches/patch-CPP_myWindows_myGetNumberOfProcessors_cpp 20 Apr 2007 
17:50:05 -  1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,26 +0,0 @@
-$OpenBSD: patch-CPP_myWindows_myGetNumberOfProcessors_cpp,v 1.1.1.1 2007/04/20 
17:50:05 steven Exp $
 CPP/myWindows/myGetNumberOfProcessors.cpp.orig Sat Jan 20 18:06:41 2007
-+++ CPP/myWindows/myGetNumberOfProcessors.cpp  Sat Apr 14 07:28:38 2007
-@@ -14,16 +14,16 @@ namespace NWindows
-   {
-   #if defined (__NetBSD__) || defined(__OpenBSD__)
-   int GetNumberOfProcessors() {
--  int mib[2];
--  size_t value[2];
-+  int mib[2], value;
-+  size_t len;
-   int nbcpu = 1;
- 
-   mib[0] = CTL_HW;
-   mib[1] = HW_NCPU;
--  value[1] = sizeof(size_t);
--  if (sysctl(mib, 2, value, value+1, NULL, 0) = 0)
--  if (value[0]  nbcpu)
--  nbcpu = value[0];
-+  len = sizeof(value);
-+  if (sysctl(mib, 2, value, len, NULL, 0) = 0)
-+  if (value  nbcpu)
-+  nbcpu = value;
-   return nbcpu;
-   }
-   #elif defined (__FreeBSD__)
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/archivers/p7zip/pkg/PLIST-main,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-main
--- pkg/PLIST-main  20 Apr 2007 17:50:05 -  1.1.1.1
+++ pkg/PLIST-main  1 May 2007 06:57:39 -
@@ -8,32 +8,6 @@
 lib/p7zip/7za
 lib/p7zip/7zr
 lib/p7zip/Codecs/
-lib/p7zip/Codecs/7zAES.so
-lib/p7zip/Codecs/AES.so
-lib/p7zip/Codecs/BZip2.so
-lib/p7zip/Codecs/Branch.so
-lib/p7zip/Codecs/Copy.so
-lib/p7zip/Codecs/Deflate.so
-lib/p7zip/Codecs/LZMA.so
-lib/p7zip/Codecs/PPMD.so
-lib/p7zip/Codecs/Swap.so
-lib/p7zip/Formats/
-lib/p7zip/Formats/7z.so
-lib/p7zip/Formats/Tar.so
-lib/p7zip/Formats/Zip.so
-lib/p7zip/Formats/arj.so
-lib/p7zip/Formats/bz2.so
-lib/p7zip/Formats/cab.so
-lib/p7zip/Formats/chm.so
-lib/p7zip/Formats/cpio.so
-lib/p7zip/Formats/deb.so
-lib/p7zip/Formats/gz.so
-lib/p7zip/Formats/iso.so
-lib/p7zip/Formats/lzh.so
-lib/p7zip/Formats/nsis.so
-lib/p7zip/Formats/rpm.so
-lib/p7zip/Formats/split.so
-lib/p7zip/Formats/z.so
 @man man/man1/7z.1
 @man man/man1/7za.1
 @man man/man1/7zr.1
@@ -41,9 +15,11 @@
 share/doc/p7zip/7zC.txt
 share/doc/p7zip/7zFormat.txt
 share/doc/p7zip/ChangeLog
+share/doc/p7zip/License.txt
 share/doc/p7zip/MANUAL/
 share/doc/p7zip/MANUAL/commands/
 share/doc/p7zip/MANUAL/commands/add.htm
+share/doc/p7zip/MANUAL/commands/bench.htm
 share/doc/p7zip/MANUAL/commands/delete.htm
 share/doc/p7zip/MANUAL/commands/extract.htm
 share/doc/p7zip/MANUAL/commands/extract_full.htm
Index: pkg/PLIST-rar
===
RCS file: 

Re: UPDATE: archivers/p7zip

[Christian Weisgerber]

Josh Grosse [EMAIL PROTECTED] wrote:

 -lib/p7zip/Codecs/7zAES.so
 -lib/p7zip/Codecs/AES.so
 -lib/p7zip/Codecs/BZip2.so
 -lib/p7zip/Codecs/Branch.so
 -lib/p7zip/Codecs/Copy.so
[...]

What happened to all the modules?

-- 
Christian naddy Weisgerber  [EMAIL PROTECTED]

Re: UPDATE: archivers/p7zip

[Josh Grosse]

On Tue, May 01, 2007 at 05:38:17PM +, Christian Weisgerber wrote:
 Josh Grosse [EMAIL PROTECTED] wrote:
 
  -lib/p7zip/Codecs/7zAES.so
  -lib/p7zip/Codecs/AES.so
  -lib/p7zip/Codecs/BZip2.so
  -lib/p7zip/Codecs/Branch.so
  -lib/p7zip/Codecs/Copy.so
 [...]
 
 What happened to all the modules?

The changelog is Windows focused, but note my highlight:



Version 4.45


  - From Windows version of 7-zip 4.45 :
   - Default dictionary size was increased: Normal: 16 MB, Max: 32 MB.
   - Speed optimizations.
   - Benchmark was improved (new b command in command line version).
- The number of DLL files was reduced.
   - switch -mhcf=off is not supported now.
   - If -t{Type} switch is not specified, 7-Zip now uses extension of archive 
to detect the type of archive.
   - Some bugs were fixed (BZip2 in multithread)
   - x86 or x86_64 : ASM version of crc32 available

  - better detection of executable file (scripts do not need BCJ/BCJ2 filter)

  - default permissions are now :
- for a file  : -rw---
- for a directory : drwx--

  - on MacOSX, locale is always utf8 (because the MacOSX filesystem supports 
only utf8 filenames)

  - makefile.qnx_static and makefile.qnx_shared added (Thank to termterm)