From owner-svn-ports-branches@freebsd.org Tue Dec 8 23:48:14 2015 Return-Path: Delivered-To: svn-ports-branches@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 B93699D59E9; Tue, 8 Dec 2015 23:48:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 73EE3105E; Tue, 8 Dec 2015 23:48:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB8NmDgD010756; Tue, 8 Dec 2015 23:48:13 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8NmDvx010754; Tue, 8 Dec 2015 23:48:13 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201512082348.tB8NmDvx010754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Tue, 8 Dec 2015 23:48:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403350 - in branches/2015Q4/print/a2ps: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2015 23:48:14 -0000 Author: junovitch Date: Tue Dec 8 23:48:13 2015 New Revision: 403350 URL: https://svnweb.freebsd.org/changeset/ports/403350 Log: print/a2ps: multiple fixes - fix for malicious crafted a2ps prologue files [1] - fix whitespaces in patch - bump PORTREVISION Submitted by: feld [1] Approved by: ports-secteam (feld) Security: CVE-2015-8107 Security: https://vuxml.FreeBSD.org/freebsd/e359051d-90bd-11e5-bd18-002590263bf5.html Added: branches/2015Q4/print/a2ps/files/patch-output.c - copied, changed from r401780, head/print/a2ps/files/patch-output.c Modified: branches/2015Q4/print/a2ps/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/print/a2ps/Makefile ============================================================================== --- branches/2015Q4/print/a2ps/Makefile Tue Dec 8 23:08:11 2015 (r403349) +++ branches/2015Q4/print/a2ps/Makefile Tue Dec 8 23:48:13 2015 (r403350) @@ -3,7 +3,7 @@ PORTNAME= a2ps PORTVERSION= 4.13b -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= print MASTER_SITES= GNU LOCAL/hrs/a2ps/:i18n Copied and modified: branches/2015Q4/print/a2ps/files/patch-output.c (from r401780, head/print/a2ps/files/patch-output.c) ============================================================================== --- head/print/a2ps/files/patch-output.c Mon Nov 16 18:38:56 2015 (r401780, copy source) +++ branches/2015Q4/print/a2ps/files/patch-output.c Tue Dec 8 23:48:13 2015 (r403350) @@ -1,13 +1,13 @@ Fix for CVE-2015-8107 http://www.openwall.com/lists/oss-security/2015/11/16/4 ---- lib/output.c.orig 2015-11-16 15:29:38 UTC -+++ lib/output.c -@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_j - expand_user_string (job, FIRST_FILE (job), - (const uchar *) "Expand: requirement", - (const uchar *) token)); -- output (dest, expansion); -+ output (dest, "%s", expansion); - continue; +--- lib/output.c.orig 1999-08-31 19:42:41.000000000 +0200 ++++ lib/output.c 2015-11-18 07:08:31.672864000 +0100 +@@ -525,7 +525,7 @@ + expand_user_string (job, FIRST_FILE (job), + (const uchar *) "Expand: requirement", + (const uchar *) token)); +- output (dest, expansion); ++ output (dest, "%s", expansion); + continue; } - +