svn commit: r543580 - in head/net/rsync: . files

[Rodrigo Osorio]

On 7/28/20 10:12 AM, Adam Weinberger wrote:
> On Tue, Jul 28, 2020 at 12:59 AM Rodrigo Osorio <rodrigo at freebsd.org> wrote:
>> Author: rodrigo
>> Date: Tue Jul 28 06:59:35 2020
>> New Revision: 543580
>> URL: https://svnweb.freebsd.org/changeset/ports/543580
>>
>> Log:
>>    net/rsync upgrade to 3.2.2
>>
>> Modified: head/net/rsync/distinfo
>> ==============================================================================
>> --- head/net/rsync/distinfo     Tue Jul 28 06:43:16 2020        (r543579)
>> +++ head/net/rsync/distinfo     Tue Jul 28 06:59:35 2020        (r543580)
>> @@ -1,5 +1,9 @@
>> -TIMESTAMP = 1518368927
>> -SHA256 (rsync-3.1.3.tar.gz) = 55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0
>> -SIZE (rsync-3.1.3.tar.gz) = 905908
>> -SHA256 (rsync-patches-3.1.3.tar.gz) = 0dc2848f20ca75c07a30c3237ccf8d61b61082ae7de94758a27dac350c99fb98
>> -SIZE (rsync-patches-3.1.3.tar.gz) = 174524
>> +TIMESTAMP = 1594065295
>> +SHA256 (rsync-3.2.2.tar.gz) = 644bd3841779507665211fd7db8359c8a10670c57e305b4aab61b4e40037afa8
>> +SIZE (rsync-3.2.2.tar.gz) = 1057001
>> +SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a
>> +SIZE (rsync-patches-3.2.2.tar.gz) = 286274
>> +SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a
>> +SIZE (rsync-patches-3.2.2.tar.gz) = 286274
>> +SHA256 (rsync-patches-3.2.2.tar.gz) = eeccf4c7f178c936e451b679e64b670f707b989b7a40e2d22286407f8987ae9a
>> +SIZE (rsync-patches-3.2.2.tar.gz) = 286274
> Hi Rodrigo,
>
> The duplicated entries for the same file caused fetch to error out. I
> removed the duplicate entries. Do you know where the duplicates came
> from?

Hi Adam,

Yes I finally got it, the issue was caused by options depends on the 
same diistfile,
if multiple options are activated, the same distfile evaluated over and 
over.

We can probably fix it in the port itself by removing the 
<OPTION>_DISTFILES by a
.if ${PORT_OPTIONS:M<OPTION>} like this:

Index: Makefile
===================================================================
--- Makefile    (revision 544031)
+++ Makefile    (working copy)
@@ -80,19 +80,13 @@
  SSH_CONFIGURE_ON=    --with-rsh=ssh
  SSH_CONFIGURE_OFF=    --with-rsh=rsh

-ACL_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
-ATIMES_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
-FLAGS_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
-ICONV_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
-RENAMED_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
-TIMELIMIT_DISTFILES= ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+.include <bsd.port.pre.mk>

-.if make(makesum)
+.if ${PORT_OPTIONS:MACL} || ${PORT_OPTIONS:MATIMES} || 
${PORT_OPTIONS:MFLAGS} || ${PORT_OPTIONS:MICONV} || 
${PORT_OPTIONS:MRENAMED} || ${PORT_OPTIONS:MTIMELIMIT}
  DISTFILES+=    ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
+DISTFILES+=    ${PORTNAME}-patches-${DISTVERSION}${EXTRACT_SUFX}
  .endif

-.include <bsd.port.pre.mk>
-
  .if empty(ICONV_LIB) || ! ${PORT_OPTIONS:MICONV}
  CONFIGURE_ARGS+=ac_cv_search_libiconv_open=no
  .endif

Another alternative can be remove duplicate distfiles in the makesum.sh 
script itself.

Index: ../../Mk/Scripts/makesum.sh
===================================================================
--- Mk/Scripts/makesum.sh(revision 544031)
+++ Mk/Scripts/makesum.sh(working copy)
@@ -31,7 +31,7 @@
      grep -v "^TIMESTAMP " ${dp_DISTINFO_FILE} > ${DISTINFO_OLD}
  fi

-for file in ${dp_CKSUMFILES}; do
+for file in $(echo ${dp_CKSUMFILES} | tr " " "\n" | sort -u | tr "\n" " 
" ); do
      for alg in ${dp_CHECKSUM_ALGORITHMS}; do
              eval "alg_executable=\$dp_$alg"

I don't know which is the most suitable fix, but a fix done to avoid the 
same issue in future commits.

Cheers,

-- rodrigo


>
> # Adam
>
>
> --
> Adam Weinberger
> adamw at adamw.org
> https://www.adamw.org