Date: Sun, 14 Dec 2014 11:44:25 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374698 - in head: Mk security/krb5 security/krb5-111 security/krb5-112 security/krb5-appl Message-ID: <201412141144.sBEBiP3H027590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sun Dec 14 11:44:24 2014 New Revision: 374698 URL: https://svnweb.freebsd.org/changeset/ports/374698 QAT: https://qat.redports.org/buildarchive/r374698/ Log: - Remove support for EXTRACT_PRESERVE_OWNERSHIP - Update a few comments related to extract Differential Revision: https://reviews.freebsd.org/D1189 With hat: portmgr Modified: head/Mk/bsd.port.mk head/security/krb5-111/Makefile head/security/krb5-112/Makefile head/security/krb5-appl/Makefile head/security/krb5/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sun Dec 14 11:21:53 2014 (r374697) +++ head/Mk/bsd.port.mk Sun Dec 14 11:44:24 2014 (r374698) @@ -768,19 +768,14 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # # For extract: # -# EXTRACT_CMD - Command for extracting archive: "bzip2" if USE_BZIP2 -# is set, "gzip" otherwise. +# EXTRACT_CMD - Command for extracting archive +# Default: ${TAR} # EXTRACT_BEFORE_ARGS # - Arguments to ${EXTRACT_CMD} before filename. -# Default: "-dc" +# Default: "-xf" # EXTRACT_AFTER_ARGS # - Arguments to ${EXTRACT_CMD} following filename. -# default: "| tar -xf -" -# EXTRACT_PRESERVE_OWNERSHIP -# - Normally, when run as "root", the extract stage will -# change the owner and group of all files under ${WRKDIR} -# to 0:0. Set this variable if you want to turn off this -# feature. +# Default: "--no-same-owner --no-same-permissions" # For patch: # # EXTRA_PATCHES - Define this variable if you have patches not in @@ -2155,11 +2150,7 @@ TAR?= /usr/bin/tar # EXTRACT_SUFX is defined in .pre.mk section EXTRACT_CMD?= ${TAR} EXTRACT_BEFORE_ARGS?= -xf -.if defined(EXTRACT_PRESERVE_OWNERSHIP) -EXTRACT_AFTER_ARGS?= -.else EXTRACT_AFTER_ARGS?= --no-same-owner --no-same-permissions -.endif # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) @@ -3319,13 +3310,11 @@ do-extract: exit 1; \ fi; \ done -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) @if [ ${UID} = 0 ]; then \ ${CHMOD} -R ug-s ${WRKDIR}; \ ${CHOWN} -R 0:0 ${WRKDIR}; \ fi .endif -.endif # Patch Modified: head/security/krb5-111/Makefile ============================================================================== --- head/security/krb5-111/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5-111/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -81,14 +81,8 @@ PDF_DOC_DIR= ${WRKDIR}/krb5-${PORTVERSI CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/krb5-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/krb5-${PORTVERSION}.tar.gz ${WRKDIR}/krb5-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/krb5-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/krb5-${PORTVERSION}; \ - fi -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 Modified: head/security/krb5-112/Makefile ============================================================================== --- head/security/krb5-112/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5-112/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -87,14 +87,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PO CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 Modified: head/security/krb5-appl/Makefile ============================================================================== --- head/security/krb5-appl/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5-appl/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -124,14 +124,8 @@ HTML_DOCS= ftp.html kdestroy.html kinit CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif post-install: @${ECHO} "------------------------------------------------------" Modified: head/security/krb5/Makefile ============================================================================== --- head/security/krb5/Makefile Sun Dec 14 11:21:53 2014 (r374697) +++ head/security/krb5/Makefile Sun Dec 14 11:44:24 2014 (r374698) @@ -85,14 +85,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PO CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include" post-extract: - @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz + @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz --no-same-owner --no-same-permissions @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc -.if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ - ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \ - fi -.endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412141144.sBEBiP3H027590>