Attachment #163612 for bug #204865

Lines 2-9 Link Here

(-)archivers/p7zip/Makefile (-4 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= p7zip	4	PORTNAME= p7zip
5	PORTVERSION= 9.38.1	5	PORTVERSION= 15.09
6	PORTREVISION?= 2
7	CATEGORIES= archivers	6	CATEGORIES= archivers
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9	DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all	8	DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all
Lines 28-33 Link Here
28		27
29	OPTIONS_DEFINE= DOCS	28	OPTIONS_DEFINE= DOCS
30		29
		30	PORTDOCS= *
		31
31	post-patch:	32	post-patch:
32	${SED} -e 's!g\+\+!${CXX}!' \	33	${SED} -e 's!g\+\+!${CXX}!' \
33	-e 's!gcc!${CC}!' \	34	-e 's!gcc!${CC}!' \
Lines 51-60 Link Here
51	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za	52	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za
52	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr	53	${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr
53		54
		55	(cd ${WRKSRC}/man1 && \
		56	${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
		57
		58	do-install-DOCS-on:
54	(cd ${WRKSRC}/DOC && \	59	(cd ${WRKSRC}/DOC && \
55	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})	60	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
56	(cd ${WRKSRC}/man1 && \
57	${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1)
58	.endif	61	.endif
59		62
60	.include <bsd.port.mk>	63	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)archivers/p7zip/distinfo (-2 / +2 lines)
1	SHA256 (p7zip_9.38.1_src_all.tar.bz2) = fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995	1	SHA256 (p7zip_15.09_src_all.tar.bz2) = 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f
2	SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925	2	SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481

Lines 1-11 Link Here

(-)archivers/p7zip/files/patch-CPP-Windows-System.cpp (-4 / +4 lines)
1	--- CPP/Windows/System.cpp.orig 2008-09-07 02:29:34.000000000 +0800	1	--- CPP/Windows/System.cpp.orig 2015-09-26 08:47:01 UTC
2	+++ CPP/Windows/System.cpp 2008-09-07 02:30:23.000000000 +0800	2	+++ CPP/Windows/System.cpp
3	@@ -44,7 +44,7 @@	3	@@ -44,7 +44,7 @@ namespace NWindows
4	#elif defined (__FreeBSD__) \|\| defined (__FreeBSD_kernel__)	4	#elif defined (__FreeBSD__) \|\| defined (__FreeBSD_kernel__)
5	UInt32 GetNumberOfProcessors() {	5	UInt32 GetNumberOfProcessors() {
6	int nbcpu = 1;	6	int nbcpu = 1;
7	- size_t value;	7	- size_t value;
8	+ int value;	8	+ int value;
9	size_t len = sizeof(value);	9	size_t len = sizeof(value);
10	if (sysctlbyname("hw.ncpu", &value, &len, NULL, 0) == 0)	10	if (sysctlbyname("hw.ncpu", &value, &len, NULL, 0) == 0)
11	nbcpu = value;	11	nbcpu = value;




this isn't portable.  We can probably get away with comparing ctime
since we don't support hard links.

--- CPP/7zip/UI/Agent/Agent.cpp.orig	2015-09-17 19:02:35 UTC
+++ CPP/7zip/UI/Agent/Agent.cpp
@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const
   HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
       realIndices.Size(), testMode, extractCallback);
   if (result == S_OK)

   return result;
   COM_TRY_END
 }
--- CPP/7zip/UI/Client7z/Client7z.cpp.orig	2015-10-17 14:52:30 UTC
+++ CPP/7zip/UI/Client7z/Client7z.cpp
@@ -230,8 +230,11 @@ private:
   COutFileStream *_outFileStreamSpec;
   CMyComPtr<ISequentialOutStream> _outFileStream;
 

 
   UInt64 NumErrors;
   bool PasswordIsDefined;
@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
   }
   _outFileStream.Release();
   if (_extractMode && _processedFileInfo.AttribDefined)

 
 STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
 {
@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha
       // extractCallbackSpec->PasswordIsDefined = true;
       // extractCallbackSpec->Password = L"1";
       HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);

       if (result != S_OK)
       {
         PrintError("Extract Error");
--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig	2015-10-03 08:49:15 UTC
+++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se
     NumFiles++;
 
   if (!_stdOutMode && _extractMode && _fi.AttribDefined)
-    SetFileAttrib(_diskFilePath, _fi.Attrib);
+    SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
   
   RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));
   
@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha
   }
 }
 

   CRecordVector<CExtrRefSortPair> pairs;
   pairs.ClearAndSetSize(_extractedFolderPaths.Size());
   unsigned i;
@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs
       (WriteATime && ATimeDefined) ? &ATime : NULL,
       (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
   }

+
+  return result;
 }
--- CPP/7zip/UI/Common/ArchiveExtractCallback.h.orig	2015-10-03 10:29:09 UTC
+++ CPP/7zip/UI/Common/ArchiveExtractCallback.h
@@ -6,6 +6,8 @@
 #include "../../../Common/MyCom.h"

 #include "../../IPassword.h"
 
 #include "../../Common/FileStreams.h"
@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
   bool _saclEnabled;
   #endif
 

   void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
   HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
   HRESULT GetUnpackSize();
@@ -330,7 +334,7 @@ public:
     _baseParentFolder = indexInArc;
   }
   #endif
 
-  HRESULT SetDirsTimes();
+  HRESULT SetFinalAttribs();
 };
 
 bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
--- CPP/7zip/UI/Common/Extract.cpp.orig	2015-09-07 19:47:32 UTC
+++ CPP/7zip/UI/Common/Extract.cpp
@@ -207,7 +207,7 @@ static HRESULT DecompressArchive(
   else
     result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
   if (result == S_OK && !options.StdInMode)

   return callback->ExtractResult(result);
 }
 
--- CPP/Windows/FileDir.cpp.orig	2015-10-10 12:37:41 UTC
+++ CPP/Windows/FileDir.cpp
@@ -347,7 +347,8 @@ static int convert_to_symlink(const char
   return -1;
 }
 

 {
   if (!fileName) {
     SetLastError(ERROR_PATH_NOT_FOUND);
@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD
      stat_info.st_mode = fileAttributes >> 16;
 #ifdef ENV_HAVE_LSTAT
      if (S_ISLNK(stat_info.st_mode)) {

           TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
           return false;
         }
@@ -814,6 +817,43 @@ bool CTempDir::Remove()
   return !_mustBeDeleted;
 }
 

+
 }}}
 
 #ifndef _SFX
--- CPP/Windows/FileDir.h.orig	2015-06-19 10:52:06 UTC
+++ CPP/Windows/FileDir.h
@@ -4,6 +4,7 @@
 #define __WINDOWS_FILE_DIR_H

 bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
 
 #ifndef UNDER_CE
@@ -76,6 +80,31 @@ public:
   bool Remove();
 };
 




man/man1/7z.1.gz
man/man1/7za.1.gz
man/man1/7zr.1.gz
%%PORTDOCS%%%%DOCSDIR%%/7zC.txt
%%PORTDOCS%%%%DOCSDIR%%/7zFormat.txt
%%PORTDOCS%%%%DOCSDIR%%/License.txt
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/add.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/bench.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/delete.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract_full.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/hash.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/index.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/list.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/rename.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/style.css
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/test.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/update.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/exit_codes.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/index.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/style.css
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_exclude.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_include.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_no.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/charset.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/exclude.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/include.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/index.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/large_pages.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/list_tech.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/method.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/output_dir.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/overwrite.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/password.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/recurse.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sa.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/scrc.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sdel.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sfx.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sni.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sns.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/spf.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ssc.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdin.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdout.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stl.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stop_switch.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/style.css
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/type.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/update.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/volume.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/working_dir.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/yes.htm
%%PORTDOCS%%%%DOCSDIR%%/MANUAL/syntax.htm
%%PORTDOCS%%%%DOCSDIR%%/Methods.txt
%%PORTDOCS%%%%DOCSDIR%%/copying.txt
%%PORTDOCS%%%%DOCSDIR%%/lzma.txt
%%PORTDOCS%%%%DOCSDIR%%/readme.txt
%%PORTDOCS%%%%DOCSDIR%%/readme.unix
%%PORTDOCS%%%%DOCSDIR%%/src-history.txt
%%PORTDOCS%%%%DOCSDIR%%/unRarLicense.txt

Return to bug 204865

Lines 21-29 Link Here

(-)archivers/p7zip/files/patch-CVE-2015-1038 (-28 / +28 lines)
21	this isn't portable. We can probably get away with comparing ctime	21	this isn't portable. We can probably get away with comparing ctime
22	since we don't support hard links.	22	since we don't support hard links.
23		23
24	--- CPP/7zip/UI/Agent/Agent.cpp	24	--- CPP/7zip/UI/Agent/Agent.cpp.orig 2015-09-17 19:02:35 UTC
25	+++ CPP/7zip/UI/Agent/Agent.cpp	25	+++ CPP/7zip/UI/Agent/Agent.cpp
26	@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const	26	@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const
27	HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),	27	HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(),
28	realIndices.Size(), testMode, extractCallback);	28	realIndices.Size(), testMode, extractCallback);
29	if (result == S_OK)	29	if (result == S_OK)
Lines 32-40 Link Here
32	return result;	32	return result;
33	COM_TRY_END	33	COM_TRY_END
34	}	34	}
35	--- CPP/7zip/UI/Client7z/Client7z.cpp	35	--- CPP/7zip/UI/Client7z/Client7z.cpp.orig 2015-10-17 14:52:30 UTC
36	+++ CPP/7zip/UI/Client7z/Client7z.cpp	36	+++ CPP/7zip/UI/Client7z/Client7z.cpp
37	@@ -222,8 +222,11 @@ private:	37	@@ -230,8 +230,11 @@ private:
38	COutFileStream *_outFileStreamSpec;	38	COutFileStream *_outFileStreamSpec;
39	CMyComPtr<ISequentialOutStream> _outFileStream;	39	CMyComPtr<ISequentialOutStream> _outFileStream;
40		40
Lines 46-52 Link Here
46		46
47	UInt64 NumErrors;	47	UInt64 NumErrors;
48	bool PasswordIsDefined;	48	bool PasswordIsDefined;
49	@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se	49	@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se
50	}	50	}
51	_outFileStream.Release();	51	_outFileStream.Release();
52	if (_extractMode && _processedFileInfo.AttribDefined)	52	if (_extractMode && _processedFileInfo.AttribDefined)
Lines 71-77 Link Here
71		71
72	STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)	72	STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password)
73	{	73	{
74	@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha	74	@@ -914,6 +929,8 @@ int MY_CDECL main(int numArgs, const cha
75	// extractCallbackSpec->PasswordIsDefined = true;	75	// extractCallbackSpec->PasswordIsDefined = true;
76	// extractCallbackSpec->Password = L"1";	76	// extractCallbackSpec->Password = L"1";
77	HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);	77	HRESULT result = archive->Extract(NULL, (UInt32)(Int32)(-1), false, extractCallback);
Lines 80-97 Link Here
80	if (result != S_OK)	80	if (result != S_OK)
81	{	81	{
82	PrintError("Extract Error");	82	PrintError("Extract Error");
83	--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp	83	--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig 2015-10-03 08:49:15 UTC
84	+++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp	84	+++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp
85	@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se	85	@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se
86	NumFiles++;	86	NumFiles++;
87		87
88	if (_extractMode && _fi.AttribDefined)	88	if (!_stdOutMode && _extractMode && _fi.AttribDefined)
89	- SetFileAttrib(_diskFilePath, _fi.Attrib);	89	- SetFileAttrib(_diskFilePath, _fi.Attrib);
90	+ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);	90	+ SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks);
91	RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted));	91
92	return S_OK;	92	RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted)));
93	COM_TRY_END	93
94	@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s)	94	@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha
95	}	95	}
96	}	96	}
97		97
Lines 102-108 Link Here
102	CRecordVector<CExtrRefSortPair> pairs;	102	CRecordVector<CExtrRefSortPair> pairs;
103	pairs.ClearAndSetSize(_extractedFolderPaths.Size());	103	pairs.ClearAndSetSize(_extractedFolderPaths.Size());
104	unsigned i;	104	unsigned i;
105	@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs	105	@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs
106	(WriteATime && ATimeDefined) ? &ATime : NULL,	106	(WriteATime && ATimeDefined) ? &ATime : NULL,
107	(WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));	107	(WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL));
108	}	108	}
Lines 116-122 Link Here
116	+	116	+
117	+ return result;	117	+ return result;
118	}	118	}
119	--- CPP/7zip/UI/Common/ArchiveExtractCallback.h	119	--- CPP/7zip/UI/Common/ArchiveExtractCallback.h.orig 2015-10-03 10:29:09 UTC
120	+++ CPP/7zip/UI/Common/ArchiveExtractCallback.h	120	+++ CPP/7zip/UI/Common/ArchiveExtractCallback.h
121	@@ -6,6 +6,8 @@	121	@@ -6,6 +6,8 @@
122	#include "../../../Common/MyCom.h"	122	#include "../../../Common/MyCom.h"
Lines 127-133 Link Here
127	#include "../../IPassword.h"	127	#include "../../IPassword.h"
128		128
129	#include "../../Common/FileStreams.h"	129	#include "../../Common/FileStreams.h"
130	@@ -213,6 +215,8 @@ class CArchiveExtractCallback:	130	@@ -237,6 +239,8 @@ class CArchiveExtractCallback:
131	bool _saclEnabled;	131	bool _saclEnabled;
132	#endif	132	#endif
133		133
Lines 136-153 Link Here
136	void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);	136	void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath);
137	HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);	137	HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined);
138	HRESULT GetUnpackSize();	138	HRESULT GetUnpackSize();
139	@@ -293,7 +297,7 @@ public:	139	@@ -330,7 +334,7 @@ public:
140	_baseParentFolder = indexInArc;
141	}	140	}
		141	#endif
142		142
143	- HRESULT SetDirsTimes();	143	- HRESULT SetDirsTimes();
144	+ HRESULT SetFinalAttribs();	144	+ HRESULT SetFinalAttribs();
145	};	145	};
146		146
147	#endif	147	bool CensorNode_CheckPath(const NWildcard::CCensorNode &node, const CReadArcItem &item);
148	--- CPP/7zip/UI/Common/Extract.cpp	148	--- CPP/7zip/UI/Common/Extract.cpp.orig 2015-09-07 19:47:32 UTC
149	+++ CPP/7zip/UI/Common/Extract.cpp	149	+++ CPP/7zip/UI/Common/Extract.cpp
150	@@ -170,7 +170,7 @@ static HRESULT DecompressArchive(	150	@@ -207,7 +207,7 @@ static HRESULT DecompressArchive(
151	else	151	else
152	result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);	152	result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs);
153	if (result == S_OK && !options.StdInMode)	153	if (result == S_OK && !options.StdInMode)
Lines 156-164 Link Here
156	return callback->ExtractResult(result);	156	return callback->ExtractResult(result);
157	}	157	}
158		158
159	--- CPP/Windows/FileDir.cpp	159	--- CPP/Windows/FileDir.cpp.orig 2015-10-10 12:37:41 UTC
160	+++ CPP/Windows/FileDir.cpp	160	+++ CPP/Windows/FileDir.cpp
161	@@ -343,7 +343,8 @@ static int convert_to_symlink(const char	161	@@ -347,7 +347,8 @@ static int convert_to_symlink(const char
162	return -1;	162	return -1;
163	}	163	}
164		164
Lines 168-174 Link Here
168	{	168	{
169	if (!fileName) {	169	if (!fileName) {
170	SetLastError(ERROR_PATH_NOT_FOUND);	170	SetLastError(ERROR_PATH_NOT_FOUND);
171	@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD	171	@@ -379,7 +380,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD
172	stat_info.st_mode = fileAttributes >> 16;	172	stat_info.st_mode = fileAttributes >> 16;
173	#ifdef ENV_HAVE_LSTAT	173	#ifdef ENV_HAVE_LSTAT
174	if (S_ISLNK(stat_info.st_mode)) {	174	if (S_ISLNK(stat_info.st_mode)) {
Lines 179-185 Link Here
179	TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))	179	TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes)))
180	return false;	180	return false;
181	}	181	}
182	@@ -885,6 +888,43 @@ bool CTempDir::Remove()	182	@@ -814,6 +817,43 @@ bool CTempDir::Remove()
183	return !_mustBeDeleted;	183	return !_mustBeDeleted;
184	}	184	}
185		185
Lines 222-229 Link Here
222	+	222	+
223	}}}	223	}}}
224		224
225		225	#ifndef _SFX
226	--- CPP/Windows/FileDir.h	226	--- CPP/Windows/FileDir.h.orig 2015-06-19 10:52:06 UTC
227	+++ CPP/Windows/FileDir.h	227	+++ CPP/Windows/FileDir.h
228	@@ -4,6 +4,7 @@	228	@@ -4,6 +4,7 @@
229	#define __WINDOWS_FILE_DIR_H	229	#define __WINDOWS_FILE_DIR_H
Lines 249-255 Link Here
249	bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);	249	bool MyMoveFile(CFSTR existFileName, CFSTR newFileName);
250		250
251	#ifndef UNDER_CE	251	#ifndef UNDER_CE
252	@@ -69,6 +73,31 @@ public:	252	@@ -76,6 +80,31 @@ public:
253	bool Remove();	253	bool Remove();
254	};	254	};
255		255

Lines 9-69 Link Here

(-)archivers/p7zip/pkg-plist (-58 lines)
9	man/man1/7z.1.gz	9	man/man1/7z.1.gz
10	man/man1/7za.1.gz	10	man/man1/7za.1.gz
11	man/man1/7zr.1.gz	11	man/man1/7zr.1.gz
12	%%PORTDOCS%%%%DOCSDIR%%/7zC.txt
13	%%PORTDOCS%%%%DOCSDIR%%/7zFormat.txt
14	%%PORTDOCS%%%%DOCSDIR%%/License.txt
15	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/add.htm
16	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/bench.htm
17	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/delete.htm
18	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract.htm
19	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/extract_full.htm
20	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/hash.htm
21	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/index.htm
22	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/list.htm
23	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/rename.htm
24	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/style.css
25	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/test.htm
26	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/commands/update.htm
27	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/exit_codes.htm
28	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/index.htm
29	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/style.css
30	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_exclude.htm
31	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_include.htm
32	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ar_no.htm
33	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/charset.htm
34	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/exclude.htm
35	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/include.htm
36	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/index.htm
37	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/large_pages.htm
38	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/list_tech.htm
39	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/method.htm
40	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/output_dir.htm
41	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/overwrite.htm
42	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/password.htm
43	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/recurse.htm
44	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sa.htm
45	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/scrc.htm
46	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sdel.htm
47	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sfx.htm
48	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sni.htm
49	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/sns.htm
50	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/spf.htm
51	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/ssc.htm
52	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdin.htm
53	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stdout.htm
54	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stl.htm
55	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/stop_switch.htm
56	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/style.css
57	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/type.htm
58	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/update.htm
59	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/volume.htm
60	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/working_dir.htm
61	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/switches/yes.htm
62	%%PORTDOCS%%%%DOCSDIR%%/MANUAL/syntax.htm
63	%%PORTDOCS%%%%DOCSDIR%%/Methods.txt
64	%%PORTDOCS%%%%DOCSDIR%%/copying.txt
65	%%PORTDOCS%%%%DOCSDIR%%/lzma.txt
66	%%PORTDOCS%%%%DOCSDIR%%/readme.txt
67	%%PORTDOCS%%%%DOCSDIR%%/readme.unix
68	%%PORTDOCS%%%%DOCSDIR%%/src-history.txt
69	%%PORTDOCS%%%%DOCSDIR%%/unRarLicense.txt