Index: head/archivers/p7zip/Makefile =================================================================== --- head/archivers/p7zip/Makefile (revision 461378) +++ head/archivers/p7zip/Makefile (revision 461379) @@ -1,66 +1,66 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= p7zip PORTVERSION= 16.02 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= archivers MASTER_SITES= SF DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all MAINTAINER= rakuco@FreeBSD.org COMMENT?= File archiver with high compression ratio LICENSE?= LGPL21 ALL_TARGET?= all3 USES= cpe tar:bzip2 CPE_VENDOR= 7-zip MAKEFILE= makefile MAKE_ARGS= OPTFLAGS="${CXXFLAGS}" WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} CFLAGS_arm= -fPIC CFLAGS_armv6= -fPIC CFLAGS_armv7= -fPIC CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_powerpc= -fPIC CFLAGS_sparc64= -fPIC OPTIONS_DEFINE= DOCS PORTDOCS= * post-patch: ${SED} -e 's!g\+\+!${CXX}!' \ -e 's!gcc!${CC}!' \ -e 's/ -s //' \ -e 's/-D_LARGEFILE_SOURCE//' \ -e 's/-D_FILE_OFFSET_BITS=64//' \ ${WRKSRC}/makefile.freebsd6+ > ${WRKSRC}/makefile.machine ${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \ ${WRKSRC}/man1/* ${MV} ${WRKSRC}/README ${WRKSRC}/DOC/readme.unix .if ! defined(PKGNAMESUFFIX) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/p7zip .for BINARY in 7z 7za 7zr 7zCon.sfx ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINARY} ${STAGEDIR}${PREFIX}/libexec/p7zip .endfor ${INSTALL_LIB} ${WRKSRC}/bin/7z.so ${STAGEDIR}${PREFIX}/libexec/p7zip ${INSTALL_SCRIPT} ${FILESDIR}/7z ${STAGEDIR}${PREFIX}/bin ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7za ${LN} -sf 7z ${STAGEDIR}${PREFIX}/bin/7zr (cd ${WRKSRC}/man1 && \ ${INSTALL_MAN} 7z*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1) do-install-DOCS-on: (cd ${WRKSRC}/DOC && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endif .include Index: head/archivers/p7zip/files/patch-CVE-2017-17969 =================================================================== --- head/archivers/p7zip/files/patch-CVE-2017-17969 (nonexistent) +++ head/archivers/p7zip/files/patch-CVE-2017-17969 (revision 461379) @@ -0,0 +1,35 @@ +Obtained-from: https://anonscm.debian.org/cgit/users/robert/p7zip.git/tree/debian/patches/13-CVE-2017-17969.patch +--- +From: =?utf-8?q?Antoine_Beaupr=C3=A9?= +Date: Fri, 2 Feb 2018 11:11:41 +0100 +Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp + +Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch +Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7 +Bug: https://sourceforge.net/p/p7zip/bugs/204/ +Bug-Debian: https://bugs.debian.org/888297 +Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969 +Reviewed-by: Salvatore Bonaccorso +Last-Update: 2018-02-01 +Applied-Upstream: 18.00-beta +--- + CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- CPP/7zip/Compress/ShrinkDecoder.cpp ++++ CPP/7zip/Compress/ShrinkDecoder.cpp +@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * + { + _stack[i++] = _suffixes[cur]; + cur = _parents[cur]; ++ if (cur >= kNumItems || i >= kNumItems) ++ break; + } +- ++ ++ if (cur >= kNumItems || i >= kNumItems) ++ break; ++ + _stack[i++] = (Byte)cur; + lastChar2 = (Byte)cur; + Property changes on: head/archivers/p7zip/files/patch-CVE-2017-17969 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property