svn commit: r318356 - in head/ports-mgmt/pkg: . files

[Bryan Drewery]

Author: bdrewery
Date: Fri May 17 05:13:32 2013
New Revision: 318356
URL: http://svnweb.freebsd.org/changeset/ports/318356

Log:
  - Fix crash while packaging netbeans
  
  Reported by:  many
  Reviewed by:  bapt

Added:
  head/ports-mgmt/pkg/files/
  head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Fri May 17 04:41:52 2013	(r318355)
+++ head/ports-mgmt/pkg/Makefile	Fri May 17 05:13:32 2013	(r318356)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/ \

Added: head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-libpkg__pkg_elf.c	Fri May 17 05:13:32 2013	(r318356)
@@ -0,0 +1,26 @@
+--- ./libpkg/pkg_elf.c.orig	2013-05-16 23:38:38.020628709 -0500
++++ ./libpkg/pkg_elf.c	2013-05-16 23:57:33.346627390 -0500
+@@ -258,7 +258,10 @@
+ 	}
+ 
+ 	if (note != NULL) {
+-		data = elf_getdata(note, NULL);
++		if ((data = elf_getdata(note, NULL)) == NULL) {
++			ret = EPKG_END; /* Some error occurred, ignore this file */
++			goto cleanup;
++		}
+ 		osname = (const char *) data->d_buf + sizeof(Elf_Note);
+ 		if (strncasecmp(osname, "freebsd", sizeof("freebsd")) != 0 &&
+ 		    strncasecmp(osname, "dragonfly", sizeof("dragonfly")) != 0) {
+@@ -272,7 +275,10 @@
+ 		}
+ 	}
+ 
+-	data = elf_getdata(dynamic, NULL);
++	if ((data = elf_getdata(dynamic, NULL)) == NULL) {
++		ret = EPKG_END; /* Some error occurred, ignore this file */
++		goto cleanup;
++	}
+ 
+ 	/* First, scan through the data from the .dynamic section to
+ 	   find any RPATH or RUNPATH settings.  These are colon