Opened 10 years ago

Closed 10 years ago

Last modified 10 years ago

#44117 closed update (fixed)

rsync: update to 3.1.1

Reported by: jimjag (Jim Jagielski) Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch maintainer Cc: Schamschula (Marius Schamschula), mojca (Mojca Miklavec)
Port: rsync

Description


Attachments (2)

rsync-3.1.1.patch (119.8 KB) - added by jimjag (Jim Jagielski) 10 years ago.
rsync-3.1.1-final.patch (119.8 KB) - added by jimjag (Jim Jagielski) 10 years ago.
With deletion of cflags and ldflags

Download all attachments as: .zip

Change History (18)

Changed 10 years ago by jimjag (Jim Jagielski)

Attachment: rsync-3.1.1.patch added

comment:1 Changed 10 years ago by mf2k (Frank Schima)

Keywords: haspatch maintainer added; rsync removed
Version: 2.3.0

comment:2 Changed 10 years ago by Schamschula (Marius Schamschula)

Cc: mschamschula@… added

Cc Me!

comment:3 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)

Summary: rsync-3.1.1 : Diffs to bring port up to 3.1.1rsync: update to 3.1.1

I'm curious why you've added this line:

configure.ldflags  "-L${prefix}/lib"

and also why this line already exists in the portfile:

configure.cflags   "-Os -I${prefix}/include" 

since both of those values are the defaults.

Last edited 10 years ago by ryandesign (Ryan Carsten Schmidt) (previous) (diff)

comment:4 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: mojca@… added

You might also take a look at mojca's comments about 3.1.1pre2 in comment:ticket:40803:9 and see if any of them still apply to 3.1.1.

comment:5 in reply to:  3 Changed 10 years ago by ryandesign (Ryan Carsten Schmidt)

Replying to ryandesign@…:

and also why this line already exists in the portfile:

configure.cflags   "-Os -I${prefix}/include" 

since both of those values are the defaults.

Hmm, actually the -I flag would be in cppflags by default, not cflags. Are we saying rsync's build system erroneously does not understand cppflags?

comment:6 Changed 10 years ago by mojca (Mojca Miklavec)

If you take a look at my patch, I actually had to remove the cflags to make the compilation work in the first place. But I submitted a bug report, so maybe it works with that flag again (which is not to say that the flag is needed).

My removal of patches in the other ticket was wrong (sorry for the mistake, but it's weird to have a bunch of official patches and I still find the concept a bit weird).

The patches could actually be fetched from http://rsync.samba.org/ftp/rsync/src/rsync-patches-3.1.1.tar.gz automatically as opposed to making copies of those files locally and keep updating them. What do you think?

So I would suggest to:

  • remove those explicit flag unless you can explain why they are needed
  • try to fetch both compresed files and apply patches from there

comment:7 Changed 10 years ago by jimjag (Jim Jagielski)

The cflags line is not new but the ldflags line is. The latter is due to changes from 3.1.0+

comment:8 Changed 10 years ago by jimjag (Jim Jagielski)

Regarding the patches: Please note that 2 of those files are not included in the patches tarball. I think it's best to continue as is with as few changes as needed,

comment:9 Changed 10 years ago by mojca (Mojca Miklavec)

But why is ldflags needed?

comment:10 Changed 10 years ago by jimjag (Jim Jagielski)

Confirmed that rsync-3.1.1 works as expected and passes bbouncer tests w/o the configure.cflags and configure.ldflags lines.

Will commit (and release) as soon as I get commit privs as rsync maintainer.

comment:11 in reply to:  10 Changed 10 years ago by mojca (Mojca Miklavec)

Replying to jimjag@…:

Will commit (and release) as soon as I get commit privs as rsync maintainer.

Did you recently get an answer that you are getting commit rights?

comment:12 Changed 10 years ago by jimjag (Jim Jagielski)

Considering that I've been maintaining rsync for ~2years, I assume that my request for commit will be approved.

comment:13 Changed 10 years ago by mojca (Mojca Miklavec)

But I wouldn't count on reply being fast enough, they have a long backlog. I know that some people waited for months to get the answer (not for the actual commit rights, but just to get the decision).

That's why I asked. It might be better to commit your changes now to get the updated port than to wait indefinitely for the commit rights.

I can commit the changes, but just in case I would like to see the patch from you to make sure that I don't misunderstand and commit the wrong thing.

comment:14 Changed 10 years ago by jimjag (Jim Jagielski)

The patch is to be attached... awaiting someone w/ commit to apply...

Changed 10 years ago by jimjag (Jim Jagielski)

Attachment: rsync-3.1.1-final.patch added

With deletion of cflags and ldflags

comment:15 Changed 10 years ago by mojca (Mojca Miklavec)

Resolution: fixed
Status: newclosed

Thank you. r121462.

comment:16 Changed 10 years ago by jimjag (Jim Jagielski)

Thx!

Note: See TracTickets for help on using tickets.