Version 9.38.1

- bug 145 "p7zip crashes while moving memory in MoveItems

Version 9.38
- patch 23 fixes "7z with unicode file name with surrogate pair is not handled well in Linux"

- bug 139 "password from commanline is visible in processes list"
    Now the characters of the password are replaced with *.

- From Windows version of 7-zip
   - bug138 If you extract the password with # program crashes
     7z now supports long password in RAR 3 and 4.

7 files changed, 47 insertions, 39 deletions

diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 8954932ad13..e5e00c7a58b 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2014/12/01 12:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2015/06/02 14:53:10 adam Exp $
 
-DISTNAME=	p7zip_9.20.1_src_all
-PKGNAME=	p7zip-9.20.1
-PKGREVISION=	2
+DISTNAME=	p7zip_9.38.1_src_all
+PKGNAME=	p7zip-9.38.1
 CATEGORIES=	archivers
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=p7zip/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +20,7 @@ PTHREAD_OPTS+=		require
 PLIST_VARS=		dll
 
 # compiles, but does not recognize any archives as supported
-DYNAMIC_7Z=		YES
+DYNAMIC_7Z?=		NO
 .if !empty(DYNAMIC_7Z:MYES)
 BUILD_TARGET=		all2
 PLIST.dll=		yes
@@ -48,7 +47,7 @@ SUBST_SED.lib+=		-e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib/\","
 SUBST_STAGE.lib=	post-patch
 
 .include "../../mk/dlopen.buildlink3.mk"
-BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
 .include "../../mk/endian.mk"
 
@@ -71,11 +70,11 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/README \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/commands/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/commands/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip/commands
-	${INSTALL_DATA} ${WRKSRC}/DOCS/MANUAL/switches/*.* \
+	${INSTALL_DATA} ${WRKSRC}/DOC/MANUAL/switches/*.* \
 		${DESTDIR}${PREFIX}/share/doc/p7zip/switches
 	${INSTALL_MAN} ${WRKSRC}/man1/7z.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/archivers/p7zip/PLIST b/archivers/p7zip/PLIST
index 697e847b643..6a17bb9c3c6 100644
--- a/archivers/p7zip/PLIST
+++ b/archivers/p7zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2013/10/04 21:51:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/06/02 14:53:10 adam Exp $
 bin/7z
 bin/7za
 ${PLIST.dll}lib/7z.so
@@ -13,8 +13,10 @@ share/doc/p7zip/commands/bench.htm
 share/doc/p7zip/commands/delete.htm
 share/doc/p7zip/commands/extract.htm
 share/doc/p7zip/commands/extract_full.htm
+share/doc/p7zip/commands/hash.htm
 share/doc/p7zip/commands/index.htm
 share/doc/p7zip/commands/list.htm
+share/doc/p7zip/commands/rename.htm
 share/doc/p7zip/commands/style.css
 share/doc/p7zip/commands/test.htm
 share/doc/p7zip/commands/update.htm
@@ -35,10 +37,17 @@ share/doc/p7zip/switches/output_dir.htm
 share/doc/p7zip/switches/overwrite.htm
 share/doc/p7zip/switches/password.htm
 share/doc/p7zip/switches/recurse.htm
+share/doc/p7zip/switches/sa.htm
+share/doc/p7zip/switches/scrc.htm
+share/doc/p7zip/switches/sdel.htm
 share/doc/p7zip/switches/sfx.htm
+share/doc/p7zip/switches/sni.htm
+share/doc/p7zip/switches/sns.htm
+share/doc/p7zip/switches/spf.htm
 share/doc/p7zip/switches/ssc.htm
 share/doc/p7zip/switches/stdin.htm
 share/doc/p7zip/switches/stdout.htm
+share/doc/p7zip/switches/stl.htm
 share/doc/p7zip/switches/stop_switch.htm
 share/doc/p7zip/switches/style.css
 share/doc/p7zip/switches/type.htm
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index 5af41a044a5..97e5b9987b6 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.42 2014/12/01 12:43:07 wiz Exp $
+$NetBSD: distinfo,v 1.43 2015/06/02 14:53:10 adam Exp $
 
-SHA1 (p7zip_9.20.1_src_all.tar.bz2) = 1cd567e043ee054bf08244ce15f32cb3258306b7
-RMD160 (p7zip_9.20.1_src_all.tar.bz2) = c3ff2dd12459282b46d9a68ab4af7800ff46039f
-Size (p7zip_9.20.1_src_all.tar.bz2) = 3835235 bytes
-SHA1 (patch-CPP_Windows_DLL.cpp) = 212140b873058eb838a1eb97befebb90512cd7e4
-SHA1 (patch-aa) = 6031e4a571c890b6620627989d056ba606c2e0ca
-SHA1 (patch-ab) = a9bd9ab50f6c2d5964de9b2c4e5d9d75e3c29b79
-SHA1 (patch-ac) = f5f0acd488a7c524b692b5660042baa79f9937ce
+SHA1 (p7zip_9.38.1_src_all.tar.bz2) = 6b1eccf272d8b141a94758f80727ae633568ba69
+RMD160 (p7zip_9.38.1_src_all.tar.bz2) = df76939ed67f3835fe4f8e92f2fec1ab4e4328c6
+Size (p7zip_9.38.1_src_all.tar.bz2) = 3917925 bytes
+SHA1 (patch-CPP_Windows_DLL.cpp) = 12fb3f3cf4d32b8848f741dde6bcb0e56a9c6745
+SHA1 (patch-aa) = 91917c8cfc9638444a32924570067a4298c82105
+SHA1 (patch-ab) = c680fb037b9ef5e19e4c8dc71dd710598277a61b
+SHA1 (patch-ac) = 245f93d2a250b0e2f17e7828a82787ac05652800
diff --git a/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp b/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
index d37870bd452..6668cff1936 100644
--- a/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
+++ b/archivers/p7zip/patches/patch-CPP_Windows_DLL.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.1 2014/12/01 12:43:07 wiz Exp $
+$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.2 2015/06/02 14:53:10 adam Exp $
 
 Adapt for pkgsrc on OS X.
 
---- CPP/Windows/DLL.cpp.orig	2010-02-28 12:44:52.000000000 +0000
+--- CPP/Windows/DLL.cpp.orig	2011-07-09 16:25:31.000000000 +0000
 +++ CPP/Windows/DLL.cpp
 @@ -2,7 +2,7 @@
  
@@ -13,7 +13,7 @@ Adapt for pkgsrc on OS X.
  #include <mach-o/dyld.h>
  #elif ENV_BEOS
  #include <kernel/image.h>
-@@ -39,7 +39,7 @@ TRACEN((printf("CLibrary::Free(%p)\n",(v
+@@ -34,7 +34,7 @@ TRACEN((printf("CLibrary::Free(this=%p,%
    if (_module == 0)
      return true;
  
@@ -22,7 +22,7 @@ Adapt for pkgsrc on OS X.
    int ret = NSUnLinkModule ((NSModule)_module, 0);
  #elif ENV_BEOS
    int ret = unload_add_on((image_id)_module);
-@@ -57,7 +57,7 @@ static FARPROC local_GetProcAddress(HMOD
+@@ -52,7 +52,7 @@ static FARPROC local_GetProcAddress(HMOD
    void *ptr = 0;
    TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
    if (module) {
@@ -31,16 +31,16 @@ Adapt for pkgsrc on OS X.
      char name[MAX_PATHNAME_LEN];
      snprintf(name,sizeof(name),"_%s",lpProcName);
      name[sizeof(name)-1] = 0;
-@@ -115,7 +115,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
+@@ -103,7 +103,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
  
-   TRACEN((printf("CLibrary::Load(%ls) => %s\n",lpLibFileName,name)))
+   TRACEN((printf("CLibrary::Load(this=%p,%ls) => %s\n",(void *)this,lpLibFileName,name)))
  
 -#ifdef __APPLE_CC__
 +#if defined(USE_APPLE_BUNDLE)
    NSObjectFileImage image;
    NSObjectFileImageReturnCode nsret;
  
-@@ -173,7 +173,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
+@@ -161,7 +161,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
      if (fctTest) fctTest();
  
    } else {
diff --git a/archivers/p7zip/patches/patch-aa b/archivers/p7zip/patches/patch-aa
index 3328f799022..1ffd46c6514 100644
--- a/archivers/p7zip/patches/patch-aa
+++ b/archivers/p7zip/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2014/04/26 01:16:54 dsainty Exp $
+$NetBSD: patch-aa,v 1.20 2015/06/02 14:53:10 adam Exp $
 
---- makefile.machine.orig	2010-05-30 08:33:48.000000000 +0000
+--- makefile.machine.orig	2015-02-25 20:12:06.000000000 +0000
 +++ makefile.machine
-@@ -2,20 +2,20 @@
+@@ -2,20 +2,18 @@
  # makefile for Linux (x86, PPC, alpha ...)
  #
  
@@ -16,12 +16,10 @@ $NetBSD: patch-aa,v 1.19 2014/04/26 01:16:54 dsainty Exp $
  	-D_7ZIP_LARGE_PAGES \
  	$(LOCAL_FLAGS)
  
--CXX=g++ $(ALLFLAGS)
--CC=gcc $(ALLFLAGS)
+-CXX=g++
+-CC=gcc
 -CC_SHARED=-fPIC
 -LINK_SHARED=-fPIC -shared
-+CXX+=$(ALLFLAGS)
-+CC+=$(ALLFLAGS)
 +CC_SHARED=
 +LINK_SHARED=-shared
  
diff --git a/archivers/p7zip/patches/patch-ab b/archivers/p7zip/patches/patch-ab
index a637ae9efe4..587dc39be5a 100644
--- a/archivers/p7zip/patches/patch-ab
+++ b/archivers/p7zip/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2011/03/14 12:36:43 adam Exp $
+$NetBSD: patch-ab,v 1.12 2015/06/02 14:53:10 adam Exp $
 
 --- CPP/Windows/FileFind.cpp.orig	2009-06-03 19:40:16.000000000 +0200
 +++ CPP/Windows/FileFind.cpp
-@@ -311,7 +311,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar
+@@ -350,7 +350,8 @@ bool CFindFile::FindFirst(LPCSTR wildcar
    }
  
    TRACEN((printf("CFindFile::FindFirst : closedir-2(dirp=%p)\n",_dirp)))
diff --git a/archivers/p7zip/patches/patch-ac b/archivers/p7zip/patches/patch-ac
index ca7470f1cbd..522357e9e8f 100644
--- a/archivers/p7zip/patches/patch-ac
+++ b/archivers/p7zip/patches/patch-ac
@@ -1,19 +1,21 @@
-$NetBSD: patch-ac,v 1.7 2010/06/16 08:30:09 adam Exp $
+$NetBSD: patch-ac,v 1.8 2015/06/02 14:53:10 adam Exp $
 
---- makefile.glb.orig	2009-07-03 20:44:21.000000000 +0000
+--- makefile.glb.orig	2015-02-19 14:56:02.000000000 +0000
 +++ makefile.glb
-@@ -1,12 +1,12 @@
+@@ -1,14 +1,14 @@
  
  RM=rm -f
+ 
 -CFLAGS=-c -I. \
 +CFLAGS+=-c -I. \
  -I../../../../C \
  -I../../../myWindows \
  -I../../../include_windows \
- -I../../..
+ -I../../.. \
+ $(ALLFLAGS) $(ALLFLAGS_C)
  
 -CXXFLAGS=-c -I. \
 +CXXFLAGS+=-c -I. \
  -I../../../myWindows \
  -I../../../ \
- -I../../../include_windows
+ -I../../../include_windows \