From nobody Sun Oct 23 15:16:16 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 4MwMH43k5nz4gdCp; Sun, 23 Oct 2022 15:16:16 +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 4MwMH43JQlz3f7p; Sun, 23 Oct 2022 15:16:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666538176; 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=+P9UDkWRMmkRYrk8RAdFRWKkV+jFwsHcqHeLVMLxw3o=; b=b4KR+pJfPxHUlncG8dgc67M5iQHjS83mr9vzMpBelLTbnqL8fJVi4FF5ePKj4zMKRP7mwQ y++d6pVOE8q/kZhoGgtxrQfUNF4yYTQMXohcG61g/EbFnkqIMNwCheZEka1Xnfz2ICLWIC UUzxqqo29jaengd2xf8ZMBmqXgbXsbzuAMbY+Pb96/3D2XsiFyympFdY/Ghq5B3DK5YHZG bZzMflhsAOkCfrCxp2x8RaAo8W0IQrgAwd8Ms8E5aw0lbehNGVcmiVxuz49YVTq6bh1CmI BL6DnjvllvlhracZVvcVr1koluWJCBFbpotVTSuX50bKhb5X+Gh42jAGvAUPEA== 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 4MwMH4256SzwFb; Sun, 23 Oct 2022 15:16:16 +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 29NFGG6L075788; Sun, 23 Oct 2022 15:16:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29NFGGcU075787; Sun, 23 Oct 2022 15:16:16 GMT (envelope-from git) Date: Sun, 23 Oct 2022 15:16:16 GMT Message-Id: <202210231516.29NFGGcU075787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 1f2f7227e8ca - main - net/rsync: Fix distinfo file generation 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f2f7227e8ca9c91872adf2d3b67c69dda097961 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666538176; 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=+P9UDkWRMmkRYrk8RAdFRWKkV+jFwsHcqHeLVMLxw3o=; b=ySP8EU9EQYcCZ5mYkNeYMMnk/ETq4xAixW5WCJXJWHE8IoyIsgVb/j79cqBhrdkqkR/UlG E0cwO+5JfyC0xQD8J49so0ka8FqH4kxvZOj5qTrjVZdUz9/j43NviDHrAtV1CU/zVekTRh mio5e2yPpNYEY7I+xhNGYdBZBxC3dMevb5KaiSmyCDMcuZd/9r8n1yj2S8s0PM7QnZONyw xGgrBDyI4yVQOCoLnWbOPncHfY8GGsojGDetDD2gs3gVCPq+P+mDFGCLcB09lf9d4ssiCR QoiSKa8a66eY/V728hVAZFAnH3f5b64xkyuSa+HhiS1wTL8k0fP+WmWNqqLROQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666538176; a=rsa-sha256; cv=none; b=EcxeAlL4HQmrMc/fc4Ur9Sr458msYNcJbciuPrrtqdNbT8oANCtpQYq2GregIrXIJ+I833 pBb87iCiu1KikjrZeUbUtlLbvqlOsz9BmudGV7wQY5LK+Sbp/FXsCdsiotGoFn6ix6C1vY G0iKtgE8OZlZQWyXkofwbiBDxOFDa4tqPigxfpICkrh8R9BD/u/TRd+BGQ+48h9DsE0w5G qhYxfzFrv8PHJEGdI2MvYErSpU7Yt7UyTLL3OPkwBcL1C5oskMat2f+dcE8v0Out6rJKDj AwUReEzJ4GVKXX7vrR13OIi/RjMetgfFmwZXwPnfoK9HdB7m4uv0MSpn9Knf0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f2f7227e8ca9c91872adf2d3b67c69dda097961 commit 1f2f7227e8ca9c91872adf2d3b67c69dda097961 Author: Rodrigo Osorio AuthorDate: 2022-10-23 14:40:36 +0000 Commit: Rodrigo Osorio CommitDate: 2022-10-23 15:06:05 +0000 net/rsync: Fix distinfo file generation Fix a long standing issue in distinfo file generation caused by the way patch distfiles are handled. In the previous code, every time a patch was activated, it adds its own entry into the DISTFILES variable, but because all the patches comes from the same distfile, we ended with duplicate entries in the list. As a consequence, the make makesum target generates a distinfo file with duplicate entries, causing issues to the builder who tries to fetch and untar the same file in paralel. Now we add the distfile to the list if one of the options is activated, avoiding duplication in the DISTFILES list. This fix has no impact on the generated package, so no PORTREVISION bump is required. --- net/rsync/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 6d9a68ccca1d..785b0d061f5d 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -58,18 +58,15 @@ ZLIB_BASE_DESC= Use zlib from base instead of bundled one PTS_DESC= Functionality provided by third party patches RENAMED_DESC= Add support for renamed file detection -FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} FLAGS_EXTRA_PATCHES= ${WRKSRC}/patches/fileflags.diff \ ${FILESDIR}/extrapatch-main.c -ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} ICONV_USES= iconv:translit ICONV_CONFIGURE_ENABLE= iconv iconv-open POPT_PORT_LIB_DEPENDS= libpopt.so:devel/popt POPT_PORT_CONFIGURE_OFF= --with-included-popt -RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} RENAMED_EXTRA_PATCHES= ${WRKSRC}/patches/detect-renamed.diff SSH_CONFIGURE_ON= --with-rsh=ssh @@ -77,7 +74,9 @@ SSH_CONFIGURE_OFF= --with-rsh=rsh ZLIB_BASE_CONFIGURE_ON= --with-included-zlib=no -.if make(makesum) +.include + +.if make(makesum) || ${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MICONV} || ${PORT_OPTIONS:MRENAMED} DISTFILES+= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX} .endif