From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 22 18:40:55 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7E873270;
 Sun, 22 Mar 2015 18:40:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.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 6A4B328A;
 Sun, 22 Mar 2015 18:40:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MIettA045038;
 Sun, 22 Mar 2015 18:40:55 GMT (envelope-from johans@FreeBSD.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MIesv9045036;
 Sun, 22 Mar 2015 18:40:54 GMT (envelope-from johans@FreeBSD.org)
Message-Id: <201503221840.t2MIesv9045036@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: johans set sender to
 johans@FreeBSD.org using -f
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 22 Mar 2015 18:40:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r381946 - in head/archivers/rpm4: . 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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Mar 2015 18:40:55 -0000

Author: johans
Date: Sun Mar 22 18:40:54 2015
New Revision: 381946
URL: https://svnweb.freebsd.org/changeset/ports/381946
QAT: https://qat.redports.org/buildarchive/r381946/

Log:
  Add security fix for CVE-2014-8118
  
  PR:		198796
  Submitted by:	Sevan Janiyan <venture37@geeklan.co.uk>
  Obtained from:	https://bugzilla.redhat.com/show_bug.cgi?id=1168715
  MFH:		2015Q1

Added:
  head/archivers/rpm4/files/patch-lib_cpio.c   (contents, props changed)
Modified:
  head/archivers/rpm4/Makefile

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Sun Mar 22 18:39:33 2015	(r381945)
+++ head/archivers/rpm4/Makefile	Sun Mar 22 18:40:54 2015	(r381946)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rpm
 PORTVERSION=	4.12.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/

Added: head/archivers/rpm4/files/patch-lib_cpio.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/archivers/rpm4/files/patch-lib_cpio.c	Sun Mar 22 18:40:54 2015	(r381946)
@@ -0,0 +1,15 @@
+Fix for CVE-2014-8118 as found at
+https://bugzilla.redhat.com/show_bug.cgi?id=1168715
+
+--- lib/cpio.c.orig	2015-03-22 19:29:29.000000000 +0100
++++ lib/cpio.c	2015-03-22 19:29:30.000000000 +0100
+@@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, ch
+ 
+     GET_NUM_FIELD(hdr.filesize, fsize);
+     GET_NUM_FIELD(hdr.namesize, nameSize);
++    if (nameSize <= 0 || nameSize > 4096) {
++	return RPMERR_BAD_HEADER;
++    }
+ 
+     char name[nameSize + 1];
+     read = Fread(name, nameSize, 1, cpio->fd);