[Midnightbsd-cvs] mports [19703] trunk/archivers/rpm4: update plist, fix cpio issue.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 11 05:47:43 EDT 2015
Revision: 19703
http://svnweb.midnightbsd.org/mports/?rev=19703
Author: laffer1
Date: 2015-08-11 05:47:42 -0400 (Tue, 11 Aug 2015)
Log Message:
-----------
update plist, fix cpio issue.
Modified Paths:
--------------
trunk/archivers/rpm4/Makefile
trunk/archivers/rpm4/pkg-plist
Added Paths:
-----------
trunk/archivers/rpm4/files/patch-lib_cpio.c
Modified: trunk/archivers/rpm4/Makefile
===================================================================
--- trunk/archivers/rpm4/Makefile 2015-08-11 00:09:35 UTC (rev 19702)
+++ trunk/archivers/rpm4/Makefile 2015-08-11 09:47:42 UTC (rev 19703)
@@ -2,7 +2,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/
@@ -30,8 +30,8 @@
NLS_LIBS= -lintl
PORTDOCS= *
-USES= alias gmake libtool lua:51 pathfix pkgconfig shebangfix \
- tar:bzip2
+USES= alias gmake libarchive libtool lua:51 pathfix pkgconfig \
+ shebangfix tar:bzip2
USE_BDB= 48+
INVALID_BDB_VER=51
GNU_CONFIGURE= yes
@@ -64,10 +64,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 6000
-LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
-.endif
-
post-patch:
${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
Added: trunk/archivers/rpm4/files/patch-lib_cpio.c
===================================================================
--- trunk/archivers/rpm4/files/patch-lib_cpio.c (rev 0)
+++ trunk/archivers/rpm4/files/patch-lib_cpio.c 2015-08-11 09:47:42 UTC (rev 19703)
@@ -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);
Property changes on: trunk/archivers/rpm4/files/patch-lib_cpio.c
___________________________________________________________________
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
Modified: trunk/archivers/rpm4/pkg-plist
===================================================================
--- trunk/archivers/rpm4/pkg-plist 2015-08-11 00:09:35 UTC (rev 19702)
+++ trunk/archivers/rpm4/pkg-plist 2015-08-11 09:47:42 UTC (rev 19703)
@@ -241,80 +241,3 @@
%%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo
- at dirrm include/rpm
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/rpm
- at dirrm lib/rpm/fileattrs
- at dirrm lib/rpm/platform/aarch64-freebsd
- at dirrm lib/rpm/platform/alpha-freebsd
- at dirrm lib/rpm/platform/alphaev5-freebsd
- at dirrm lib/rpm/platform/alphaev56-freebsd
- at dirrm lib/rpm/platform/alphaev6-freebsd
- at dirrm lib/rpm/platform/alphaev67-freebsd
- at dirrm lib/rpm/platform/alphapca56-freebsd
- at dirrm lib/rpm/platform/amd64-freebsd
- at dirrm lib/rpm/platform/armv3l-freebsd
- at dirrm lib/rpm/platform/armv4b-freebsd
- at dirrm lib/rpm/platform/armv4l-freebsd
- at dirrm lib/rpm/platform/armv5tejl-freebsd
- at dirrm lib/rpm/platform/armv5tel-freebsd
- at dirrm lib/rpm/platform/armv6hl-freebsd
- at dirrm lib/rpm/platform/armv6l-freebsd
- at dirrm lib/rpm/platform/armv7hl-freebsd
- at dirrm lib/rpm/platform/armv7hnl-freebsd
- at dirrm lib/rpm/platform/armv7l-freebsd
- at dirrm lib/rpm/platform/athlon-freebsd
- at dirrm lib/rpm/platform/geode-freebsd
- at dirrm lib/rpm/platform/i386-freebsd
- at dirrm lib/rpm/platform/i486-freebsd
- at dirrm lib/rpm/platform/i586-freebsd
- at dirrm lib/rpm/platform/i686-freebsd
- at dirrm lib/rpm/platform/ia32e-freebsd
- at dirrm lib/rpm/platform/ia64-freebsd
- at dirrm lib/rpm/platform/m68k-freebsd
- at dirrm lib/rpm/platform/noarch-freebsd
- at dirrm lib/rpm/platform/pentium3-freebsd
- at dirrm lib/rpm/platform/pentium4-freebsd
- at dirrm lib/rpm/platform/ppc-freebsd
- at dirrm lib/rpm/platform/ppc32dy4-freebsd
- at dirrm lib/rpm/platform/ppc64-freebsd
- at dirrm lib/rpm/platform/ppc64iseries-freebsd
- at dirrm lib/rpm/platform/ppc64le-freebsd
- at dirrm lib/rpm/platform/ppc64p7-freebsd
- at dirrm lib/rpm/platform/ppc64pseries-freebsd
- at dirrm lib/rpm/platform/ppc8260-freebsd
- at dirrm lib/rpm/platform/ppc8560-freebsd
- at dirrm lib/rpm/platform/ppciseries-freebsd
- at dirrm lib/rpm/platform/ppcpseries-freebsd
- at dirrm lib/rpm/platform/s390-freebsd
- at dirrm lib/rpm/platform/s390x-freebsd
- at dirrm lib/rpm/platform/sh-freebsd
- at dirrm lib/rpm/platform/sh3-freebsd
- at dirrm lib/rpm/platform/sh4-freebsd
- at dirrm lib/rpm/platform/sh4a-freebsd
- at dirrm lib/rpm/platform/sparc-freebsd
- at dirrm lib/rpm/platform/sparc64-freebsd
- at dirrm lib/rpm/platform/sparc64v-freebsd
- at dirrm lib/rpm/platform/sparcv8-freebsd
- at dirrm lib/rpm/platform/sparcv9-freebsd
- at dirrm lib/rpm/platform/sparcv9v-freebsd
- at dirrm lib/rpm/platform/x86_64-freebsd
- at dirrm lib/rpm/platform
- at dirrm lib/rpm
- at dirrm lib/rpm-plugins
- at dirrm man/fr/man8
- at dirrm man/fr
- at dirrm man/ko/man8
- at dirrm man/ko
- at dirrm man/pl/man1
- at dirrm man/pl/man8
- at dirrm man/pl
- at dirrm man/ru/man8
- at dirrm man/ru
- at dirrm man/sk/man8
- at dirrm man/sk
-%%NLS%%@dirrm share/locale/cmn/LC_MESSAGES
-%%NLS%%@dirrm share/locale/cmn
-%%NLS%%@dirrm share/locale/sr at latin/LC_MESSAGES
-%%NLS%%@dirrm share/locale/sr at latin
-%%NLS%%@dirrm share/locale/te/LC_MESSAGES
-%%NLS%%@dirrm share/locale/te
More information about the Midnightbsd-cvs
mailing list