From nobody Fri Apr 22 09:46:11 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AB460199C9A1; Fri, 22 Apr 2022 09:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kl8g82y17z52Kr; Fri, 22 Apr 2022 09:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650620772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IO15m/4ySeT7d3MZvw3X+XsQgUhZQU2HqTycPh53Zao=; b=rLwzgdIgYZk0Urm8RY9NWHM9V8S0js09SDTb4Us/XoGwG09sXOCYWW7P/JvIN43aX69NRJ QoUde1E0C/R4l9JSwz29DqYSRpNvJ4WZ2UwoW0pItIY0jr549D3uQX+wDWnxnMvlzxmxOM IV6m6lhy8s/vtGfEukzBX+T/cYD0qk0ZSzhjjg8PKQmIG41z9zQLICg3FXQOfA7fsiHBnj P7Juppkx7rM2EE0Pjoo0b51YJmFgFN+dACgPutC9iYKXflhvDdTcSPx7vjPgHVnLp2pXgs 9WHDTU5KNqvKS2IH5TEAKWFGXKHaQzserAm4nnVQDVlrOvhhx32XOA0L2xe21Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 315AD1AD60; Fri, 22 Apr 2022 09:46:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23M9kBH6023567; Fri, 22 Apr 2022 09:46:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23M9kBFQ023566; Fri, 22 Apr 2022 09:46:11 GMT (envelope-from git) Date: Fri, 22 Apr 2022 09:46:11 GMT Message-Id: <202204220946.23M9kBFQ023566@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Lev A. Serebryakov" Subject: git: 61f16b172c65 - 2022Q2 - devel/subversion: Make all binaries stripping explicit. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lev X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 61f16b172c65948c6bc1502e7f05827ab4f4e728 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650620772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IO15m/4ySeT7d3MZvw3X+XsQgUhZQU2HqTycPh53Zao=; b=nwkLY5Sh/5OVz2m/goxk63nXnXX1HfTgf7ueWtOblIrE8mS+NFvSleqiUwwHiuE2NwKUav eIY1vxkf3BF39Qv5moqA5KomVBGRy3nQoVXX/wnhvudcmpqtBxZoYUjdlR0nC4qLmcAyEv AvU9akrOrajZRJEDDBZe5k2I/5l9Q8zNmTYSstv8UCl8wq8yvhQIj6gtBwH+JuszRYKngq 478clj52FjUs80XGDqNs3FzVVejIJVrwnPBym5xWHt/JWyKBxnig9ztUF/gLmOV5kd0WMW 8oNGnHa2CPhVwD3SqNYmGR2aok4FzDjH/XM+4XNQauPGDau54Dc24HNqDrKJZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650620772; a=rsa-sha256; cv=none; b=BZI34GDX0QKVJj2hZFDHovKLvO1oG9SFjE5Qlc4MDU8ej7NX3a7Ht3ar6OkI4KGbtTUoWj iznOoupMyCgiVRKwFqltBWbzi7vcyX1YMQoRMKV6C+zT2sowGIiMNUr3ReBNiAbfQQjKSm QVPY/pRnIKKVaG26Gitxn2cq7CifMhLGWA7KWyKqyoEiXGuOFYHI1LFRcVvabKqhZxe5CO LvSpCOlS4G/4Zt5pSvbo1qB9NW39RnebZK3nc7vQJQf5ym0+Y+p8jEDRYpynxCt3FUM3xM Maqtao1/X4ol2kAEcgtUJZIDjePMSY8BBG46k3VjAnUCZySvwadjfoozySom8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by lev: URL: https://cgit.FreeBSD.org/ports/commit/?id=61f16b172c65948c6bc1502e7f05827ab4f4e728 commit 61f16b172c65948c6bc1502e7f05827ab4f4e728 Author: Lev A. Serebryakov AuthorDate: 2022-04-13 18:19:35 +0000 Commit: Lev A. Serebryakov CommitDate: 2022-04-22 09:46:05 +0000 devel/subversion: Make all binaries stripping explicit. Running ${STRIP_CMD} on non-binary file can left zero-length temporary file. Strip all binaries explicitly, with list of them and loop, instead of calling ${STRIP_CMD} with '*'. (cherry picked from commit 59cb6bb257fe2d25041e9e0781c246ca6fcc2669) --- devel/subversion/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index bfcf3b3dcd98..5af347c3cf2e 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -85,6 +85,15 @@ WITH_REPOSITORY_CREATION= yes MKREPOS_TARGET= _mkrepos .endif + +BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \ + svnrdump svnserve svnsync svnversion + +TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \ + svn-populate-node-origins-index svnauthz \ + svnauthz-validate svnconflict svndiff svndiff3 \ + svndiff4 svnmover svnraisetreeconflict x509-parser + pre-everything:: @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @@ -148,7 +157,9 @@ post-build-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} post-install: ${MKREPOS_TARGET} - -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + for F in ${BINS_TO_STRIP} ; do \ + ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ + done @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -162,7 +173,10 @@ post-install-SVNSERVE_WRAPPER-on: post-install-TOOLS-on: @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} - -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + for F in ${TOOLS_TO_STRIP} ; do \ + ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ + done + # =============================================================================== repository: _mkrepos