Date: Fri, 4 Dec 2015 14:16:13 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402988 - in head/archivers: p7zip p7zip-codec-rar p7zip/files Message-ID: <201512041416.tB4EGDhV047607@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Fri Dec 4 14:16:13 2015 New Revision: 402988 URL: https://svnweb.freebsd.org/changeset/ports/402988 Log: - Update to 15.09 - Convert to new options target helper - Use PORTDOCS - Update patch files Changes: http://sourceforge.net/projects/p7zip/files/p7zip/15.09/README/view PR: 204865 Submitted by: sunpoet (myself) Approved by: rakuco (maintainer) Modified: head/archivers/p7zip-codec-rar/Makefile head/archivers/p7zip-codec-rar/pkg-plist head/archivers/p7zip/Makefile head/archivers/p7zip/distinfo head/archivers/p7zip/files/patch-CPP-Windows-System.cpp head/archivers/p7zip/files/patch-CVE-2015-1038 head/archivers/p7zip/pkg-plist Modified: head/archivers/p7zip-codec-rar/Makefile ============================================================================== --- head/archivers/p7zip-codec-rar/Makefile Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip-codec-rar/Makefile Fri Dec 4 14:16:13 2015 (r402988) @@ -20,6 +20,6 @@ OPTIONS_EXCLUDE= DOCS do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/p7zip/Codecs - ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/Rar29.so ${STAGEDIR}${PREFIX}/libexec/p7zip/Codecs + ${INSTALL_LIB} ${WRKSRC}/bin/Codecs/Rar.so ${STAGEDIR}${PREFIX}/libexec/p7zip/Codecs .include "${MASTERDIR}/Makefile" Modified: head/archivers/p7zip-codec-rar/pkg-plist ============================================================================== --- head/archivers/p7zip-codec-rar/pkg-plist Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip-codec-rar/pkg-plist Fri Dec 4 14:16:13 2015 (r402988) @@ -1 +1 @@ -libexec/p7zip/Codecs/Rar29.so +libexec/p7zip/Codecs/Rar.so Modified: head/archivers/p7zip/Makefile ============================================================================== --- head/archivers/p7zip/Makefile Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip/Makefile Fri Dec 4 14:16:13 2015 (r402988) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= p7zip -PORTVERSION= 9.38.1 -PORTREVISION?= 2 +PORTVERSION= 15.09 CATEGORIES= archivers MASTER_SITES= SF DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all @@ -28,6 +27,8 @@ CFLAGS_sparc64= -fPIC OPTIONS_DEFINE= DOCS +PORTDOCS= * + post-patch: ${SED} -e 's!g\+\+!${CXX}!' \ -e 's!gcc!${CC}!' \ @@ -51,10 +52,12 @@ do-install: ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr - (cd ${WRKSRC}/DOC && \ - ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/man1 && \ ${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1) + +do-install-DOCS-on: + (cd ${WRKSRC}/DOC && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .include <bsd.port.mk> Modified: head/archivers/p7zip/distinfo ============================================================================== --- head/archivers/p7zip/distinfo Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip/distinfo Fri Dec 4 14:16:13 2015 (r402988) @@ -1,2 +1,2 @@ -SHA256 (p7zip_9.38.1_src_all.tar.bz2) = fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995 -SIZE (p7zip_9.38.1_src_all.tar.bz2) = 3917925 +SHA256 (p7zip_15.09_src_all.tar.bz2) = 8783acf747e210e00150f7311cc06c4cd8ecf7b0c27b4adf2194284cc49b4d6f +SIZE (p7zip_15.09_src_all.tar.bz2) = 4048481 Modified: head/archivers/p7zip/files/patch-CPP-Windows-System.cpp ============================================================================== --- head/archivers/p7zip/files/patch-CPP-Windows-System.cpp Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip/files/patch-CPP-Windows-System.cpp Fri Dec 4 14:16:13 2015 (r402988) @@ -1,11 +1,11 @@ ---- CPP/Windows/System.cpp.orig 2008-09-07 02:29:34.000000000 +0800 -+++ CPP/Windows/System.cpp 2008-09-07 02:30:23.000000000 +0800 -@@ -44,7 +44,7 @@ +--- CPP/Windows/System.cpp.orig 2015-09-26 08:47:01 UTC ++++ CPP/Windows/System.cpp +@@ -44,7 +44,7 @@ namespace NWindows #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) UInt32 GetNumberOfProcessors() { int nbcpu = 1; - size_t value; -+ int value; ++ int value; size_t len = sizeof(value); if (sysctlbyname("hw.ncpu", &value, &len, NULL, 0) == 0) nbcpu = value; Modified: head/archivers/p7zip/files/patch-CVE-2015-1038 ============================================================================== --- head/archivers/p7zip/files/patch-CVE-2015-1038 Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip/files/patch-CVE-2015-1038 Fri Dec 4 14:16:13 2015 (r402988) @@ -21,9 +21,9 @@ still exists and is the same inode. XXX 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 +--- CPP/7zip/UI/Agent/Agent.cpp.orig 2015-09-17 19:02:35 UTC +++ CPP/7zip/UI/Agent/Agent.cpp -@@ -1215,7 +1215,7 @@ STDMETHODIMP CAgentFolder::Extract(const +@@ -1515,7 +1515,7 @@ STDMETHODIMP CAgentFolder::Extract(const HRESULT result = _agentSpec->GetArchive()->Extract(&realIndices.Front(), realIndices.Size(), testMode, extractCallback); if (result == S_OK) @@ -32,9 +32,9 @@ since we don't support hard links. return result; COM_TRY_END } ---- CPP/7zip/UI/Client7z/Client7z.cpp +--- CPP/7zip/UI/Client7z/Client7z.cpp.orig 2015-10-17 14:52:30 UTC +++ CPP/7zip/UI/Client7z/Client7z.cpp -@@ -222,8 +222,11 @@ private: +@@ -230,8 +230,11 @@ private: COutFileStream *_outFileStreamSpec; CMyComPtr<ISequentialOutStream> _outFileStream; @@ -46,7 +46,7 @@ since we don't support hard links. UInt64 NumErrors; bool PasswordIsDefined; -@@ -441,11 +444,23 @@ STDMETHODIMP CArchiveExtractCallback::Se +@@ -449,11 +452,23 @@ STDMETHODIMP CArchiveExtractCallback::Se } _outFileStream.Release(); if (_extractMode && _processedFileInfo.AttribDefined) @@ -71,7 +71,7 @@ since we don't support hard links. STDMETHODIMP CArchiveExtractCallback::CryptoGetTextPassword(BSTR *password) { -@@ -912,6 +927,8 @@ int MY_CDECL main(int numArgs, const cha +@@ -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); @@ -80,18 +80,18 @@ since we don't support hard links. if (result != S_OK) { PrintError("Extract Error"); ---- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp +--- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp.orig 2015-10-03 08:49:15 UTC +++ CPP/7zip/UI/Common/ArchiveExtractCallback.cpp -@@ -1083,7 +1083,7 @@ STDMETHODIMP CArchiveExtractCallback::Se +@@ -1502,7 +1502,7 @@ STDMETHODIMP CArchiveExtractCallback::Se NumFiles++; - if (_extractMode && _fi.AttribDefined) + if (!_stdOutMode && _extractMode && _fi.AttribDefined) - SetFileAttrib(_diskFilePath, _fi.Attrib); + SetFileAttrib(_diskFilePath, _fi.Attrib, &_delayedSymLinks); - RINOK(_extractCallback2->SetOperationResult(operationResult, _encrypted)); - return S_OK; - COM_TRY_END -@@ -1149,8 +1149,9 @@ static int GetNumSlashes(const FChar *s) + + RINOK(_extractCallback2->SetOperationResult(opRes, BoolToInt(_encrypted))); + +@@ -1584,8 +1584,9 @@ static unsigned GetNumSlashes(const FCha } } @@ -102,7 +102,7 @@ since we don't support hard links. CRecordVector<CExtrRefSortPair> pairs; pairs.ClearAndSetSize(_extractedFolderPaths.Size()); unsigned i; -@@ -1187,5 +1188,12 @@ HRESULT CArchiveExtractCallback::SetDirs +@@ -1622,5 +1623,12 @@ HRESULT CArchiveExtractCallback::SetDirs (WriteATime && ATimeDefined) ? &ATime : NULL, (WriteMTime && MTimeDefined) ? &MTime : (_arc->MTimeDefined ? &_arc->MTime : NULL)); } @@ -116,7 +116,7 @@ since we don't support hard links. + + return result; } ---- CPP/7zip/UI/Common/ArchiveExtractCallback.h +--- 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" @@ -127,7 +127,7 @@ since we don't support hard links. #include "../../IPassword.h" #include "../../Common/FileStreams.h" -@@ -213,6 +215,8 @@ class CArchiveExtractCallback: +@@ -237,6 +239,8 @@ class CArchiveExtractCallback: bool _saclEnabled; #endif @@ -136,18 +136,18 @@ since we don't support hard links. void CreateComplexDirectory(const UStringVector &dirPathParts, FString &fullPath); HRESULT GetTime(int index, PROPID propID, FILETIME &filetime, bool &filetimeIsDefined); HRESULT GetUnpackSize(); -@@ -293,7 +297,7 @@ public: - _baseParentFolder = indexInArc; +@@ -330,7 +334,7 @@ public: } + #endif - HRESULT SetDirsTimes(); + HRESULT SetFinalAttribs(); }; - #endif ---- CPP/7zip/UI/Common/Extract.cpp + 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 -@@ -170,7 +170,7 @@ static HRESULT DecompressArchive( +@@ -207,7 +207,7 @@ static HRESULT DecompressArchive( else result = archive->Extract(&realIndices.Front(), realIndices.Size(), testMode, ecs); if (result == S_OK && !options.StdInMode) @@ -156,9 +156,9 @@ since we don't support hard links. return callback->ExtractResult(result); } ---- CPP/Windows/FileDir.cpp +--- CPP/Windows/FileDir.cpp.orig 2015-10-10 12:37:41 UTC +++ CPP/Windows/FileDir.cpp -@@ -343,7 +343,8 @@ static int convert_to_symlink(const char +@@ -347,7 +347,8 @@ static int convert_to_symlink(const char return -1; } @@ -168,7 +168,7 @@ since we don't support hard links. { if (!fileName) { SetLastError(ERROR_PATH_NOT_FOUND); -@@ -375,7 +376,9 @@ bool SetFileAttrib(CFSTR fileName, DWORD +@@ -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)) { @@ -179,7 +179,7 @@ since we don't support hard links. TRACEN((printf("SetFileAttrib(%s,%d) : false-3\n",(const char *)name,fileAttributes))) return false; } -@@ -885,6 +888,43 @@ bool CTempDir::Remove() +@@ -814,6 +817,43 @@ bool CTempDir::Remove() return !_mustBeDeleted; } @@ -222,8 +222,8 @@ since we don't support hard links. + }}} - ---- CPP/Windows/FileDir.h + #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 @@ -249,7 +249,7 @@ since we don't support hard links. bool MyMoveFile(CFSTR existFileName, CFSTR newFileName); #ifndef UNDER_CE -@@ -69,6 +73,31 @@ public: +@@ -76,6 +80,31 @@ public: bool Remove(); }; Modified: head/archivers/p7zip/pkg-plist ============================================================================== --- head/archivers/p7zip/pkg-plist Fri Dec 4 14:03:30 2015 (r402987) +++ head/archivers/p7zip/pkg-plist Fri Dec 4 14:16:13 2015 (r402988) @@ -9,61 +9,3 @@ libexec/p7zip/7zr 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512041416.tB4EGDhV047607>