From owner-svn-ports-all@FreeBSD.ORG  Thu Jun  4 21:07:06 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5DDD670;
 Thu,  4 Jun 2015 21:07:06 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
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 B44E31483;
 Thu,  4 Jun 2015 21:07:06 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t54L76g7016452;
 Thu, 4 Jun 2015 21:07:06 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t54L76PO016451;
 Thu, 4 Jun 2015 21:07:06 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201506042107.t54L76PO016451@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 4 Jun 2015 21:07:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r388546 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2015 21:07:06 -0000

Author: bapt
Date: Thu Jun  4 21:07:06 2015
New Revision: 388546
URL: https://svnweb.freebsd.org/changeset/ports/388546

Log:
  Add USE_LINUX_RPM_BAD_PERMS
  
  This allows extracting to extract rpm containings hardlinks on read only files
  when extracted as a regular user
  
  Differential Revision:	https://reviews.freebsd.org/D2734
  Reviewed by:	mat

Modified:
  head/Mk/bsd.linux-rpm.mk

Modified: head/Mk/bsd.linux-rpm.mk
==============================================================================
--- head/Mk/bsd.linux-rpm.mk	Thu Jun  4 19:53:09 2015	(r388545)
+++ head/Mk/bsd.linux-rpm.mk	Thu Jun  4 21:07:06 2015	(r388546)
@@ -147,9 +147,16 @@ MASTER_SITE_SUBDIR+=	${MASTER_SITE_SRC_S
 ALWAYS_KEEP_DISTFILES=	yes
 .	endif
 
+.if !defined(USE_LINUX_RPM_BAD_PERMS)
 EXTRACT_CMD?=			${TAR}
-EXTRACT_BEFORE_ARGS?=	-xf
+EXTRACT_BEFORE_ARGS?=	--no-same-permissions --no-same-owner -xf
 EXTRACT_AFTER_ARGS?=
+.else
+EXTRACT_DEPENDS+=	rpm2archive:${PORTSDIR}/archivers/rpm4
+EXTRACT_CMD?=	rpm2archive
+EXTRACT_BEFORE_ARGS?=	<
+EXTRACT_AFTER_ARGS?=	| ${TAR} xf - --no-same-permissions --no-same-owner
+.endif
 
 DISTINFO_FILE?=				${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}