svn commit: r388546 - head/Mk

Baptiste Daroussin bapt at FreeBSD.org
Thu Jun 4 21:07:06 UTC 2015


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}
 


More information about the svn-ports-head mailing list