svn commit: r381952 - in branches/2015Q1/archivers/rpm4: . files

[Johan van Selst]

Author: johans
Date: Sun Mar 22 19:49:34 2015
New Revision: 381952
URL: https://svnweb.freebsd.org/changeset/ports/381952
QAT: https://qat.redports.org/buildarchive/r381952/

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

Added:
  branches/2015Q1/archivers/rpm4/files/patch-lib_cpio.c
     - copied unchanged from r381946, head/archivers/rpm4/files/patch-lib_cpio.c
Modified:
  branches/2015Q1/archivers/rpm4/Makefile
Directory Properties:
  branches/2015Q1/   (props changed)

Modified: branches/2015Q1/archivers/rpm4/Makefile
==============================================================================
--- branches/2015Q1/archivers/rpm4/Makefile	Sun Mar 22 19:49:09 2015	(r381951)
+++ branches/2015Q1/archivers/rpm4/Makefile	Sun Mar 22 19:49:34 2015	(r381952)
@@ -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/

Copied: branches/2015Q1/archivers/rpm4/files/patch-lib_cpio.c (from r381946, head/archivers/rpm4/files/patch-lib_cpio.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2015Q1/archivers/rpm4/files/patch-lib_cpio.c	Sun Mar 22 19:49:34 2015	(r381952, copy of r381946, head/archivers/rpm4/files/patch-lib_cpio.c)
@@ -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);