From owner-svn-ports-head@freebsd.org Mon Sep 7 11:50:20 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 574319CCA77; Mon, 7 Sep 2015 11:50:20 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2DC151C4A; Mon, 7 Sep 2015 11:50:20 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t87BoKCi011568; Mon, 7 Sep 2015 11:50:20 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t87BoJJF011564; Mon, 7 Sep 2015 11:50:19 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201509071150.t87BoJJF011564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Mon, 7 Sep 2015 11:50:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396262 - in head/graphics/libwmf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2015 11:50:20 -0000 Author: junovitch Date: Mon Sep 7 11:50:19 2015 New Revision: 396262 URL: https://svnweb.freebsd.org/changeset/ports/396262 Log: graphics/libwmf: Fix bug introduced by patch for CVE-2015-4696 - The original CVE-2015-4696 patch from upstream was missing line numbers in the first patch hunk. The security issue was resolved by the restructured code but a new potential bug was introduced in the process. - While here, update to my FreeBSD.org email PR: 201513 Reported by: Sevan Janiyan Obtained from: Fedora libwmf RPM git (commit c8bc53c1) Approved by: feld (mentor) MFH: 2015Q3 Modified: head/graphics/libwmf/Makefile head/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 Modified: head/graphics/libwmf/Makefile ============================================================================== --- head/graphics/libwmf/Makefile Mon Sep 7 11:34:31 2015 (r396261) +++ head/graphics/libwmf/Makefile Mon Sep 7 11:50:19 2015 (r396262) @@ -3,11 +3,11 @@ PORTNAME= libwmf PORTVERSION= 0.2.8.4 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= SF/wvware/${PORTNAME}/${PORTVERSION} -MAINTAINER= jason.unovitch@gmail.com +MAINTAINER= junovitch@FreeBSD.org COMMENT= Tools and library for converting Microsoft WMF (windows metafile) LICENSE= GPLv2 # or later Modified: head/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 ============================================================================== --- head/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 Mon Sep 7 11:34:31 2015 (r396261) +++ head/graphics/libwmf/files/patch-deb784192-CVE-2015-4696 Mon Sep 7 11:50:19 2015 (r396262) @@ -1,5 +1,8 @@ --- src/player/meta.h +++ src/player/meta.h +@@ -2585,6 +2585,8 @@ + polyrect.BR[i] = clip->rects[i].BR; + } + if (FR->region_clip) FR->region_clip (API,&polyrect); +