[MacPorts] #19591: rsync-3.0.6 update
#19591: rsync-3.0.6 update ------------------------------+--------------------------------------------- Reporter: css@… | Owner: simon@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: 1.7.1 Keywords: | Port: rsync ------------------------------+--------------------------------------------- rsync 3.0.6 has been [http://samba.org/ftp/rsync/src/rsync-3.0.6-NEWS released]. After updating the version and checksums, the xattr patch failed: {{{ ---> Verifying checksum(s) for rsync ---> Checksumming rsync-3.0.6.tar.gz ---> Extracting rsync ---> Extracting rsync-3.0.6.tar.gz ---> Applying patches to rsync ---> Applying /Users/Shared/macports/dports/net/rsync/files/patch- fileflags.diff patching file Makefile.in patching file compat.c patching file configure.in Hunk #1 succeeded at 551 (offset -2 lines). patching file flist.c Hunk #3 succeeded at 428 with fuzz 2. Hunk #4 succeeded at 560 (offset 10 lines). Hunk #5 succeeded at 650 (offset 10 lines). Hunk #6 succeeded at 787 (offset 9 lines). Hunk #7 succeeded at 932 (offset 10 lines). Hunk #8 succeeded at 1310 (offset 10 lines). Hunk #9 succeeded at 1457 (offset 18 lines). patching file generator.c Hunk #10 succeeded at 2094 (offset 4 lines). patching file log.c patching file options.c Hunk #10 succeeded at 1900 (offset 6 lines). Hunk #11 succeeded at 1990 (offset 6 lines). patching file rsync.c patching file rsync.h patching file rsync.yo Hunk #3 succeeded at 551 (offset 3 lines). Hunk #4 succeeded at 814 (offset 7 lines). Hunk #5 succeeded at 951 (offset 7 lines). Hunk #6 succeeded at 1244 (offset 15 lines). Hunk #7 succeeded at 1715 (offset 19 lines). Hunk #8 succeeded at 1771 (offset 19 lines). patching file syscall.c patching file t_stub.c patching file util.c patching file xattrs.c Hunk #1 succeeded at 283 (offset 2 lines). Hunk #2 succeeded at 887 (offset 19 lines). Hunk #3 FAILED at 1008. 1 out of 3 hunks FAILED -- saving rejects to file xattrs.c.rej Error: Target org.macports.patch returned: shell command " cd "/opt/local/var/macports/build/_Users_Shared_macports_dports_net_rsync/work/rsync-3.0.6" && patch -p1 < '/Users/Shared/macports/dports/net/rsync/files/patch- fileflags.diff'" returned error 1 Command output: Hunk #3 succeeded at 428 with fuzz 2. Hunk #4 succeeded at 560 (offset 10 lines). Hunk #5 succeeded at 650 (offset 10 lines). Hunk #6 succeeded at 787 (offset 9 lines). Hunk #7 succeeded at 932 (offset 10 lines). Hunk #8 succeeded at 1310 (offset 10 lines). Hunk #9 succeeded at 1457 (offset 18 lines). patching file generator.c Hunk #10 succeeded at 2094 (offset 4 lines). patching file log.c patching file options.c Hunk #10 succeeded at 1900 (offset 6 lines). Hunk #11 succeeded at 1990 (offset 6 lines). patching file rsync.c patching file rsync.h patching file rsync.yo Hunk #3 succeeded at 551 (offset 3 lines). Hunk #4 succeeded at 814 (offset 7 lines). Hunk #5 succeeded at 951 (offset 7 lines). Hunk #6 succeeded at 1244 (offset 15 lines). Hunk #7 succeeded at 1715 (offset 19 lines). Hunk #8 succeeded at 1771 (offset 19 lines). patching file syscall.c patching file t_stub.c patching file util.c patching file xattrs.c Hunk #1 succeeded at 283 (offset 2 lines). Hunk #2 succeeded at 887 (offset 19 lines). Hunk #3 FAILED at 1008. 1 out of 3 hunks FAILED -- saving rejects to file xattrs.c.rej Warning: the following items did not execute (for rsync): org.macports.configure org.macports.patch Error: Status 1 encountered during processing. }}} The release notes specify several changes to xattr support. I'll see if there's an updated patch available. -- Ticket URL: <http://trac.macports.org/ticket/19591> MacPorts <http://www.macports.org/> Ports system for Mac OS
#19591: rsync-3.0.6 update ------------------------------+--------------------------------------------- Reporter: css@… | Owner: simon@… Type: update | Status: new Priority: Normal | Milestone: Component: ports | Version: 1.7.1 Keywords: | Port: rsync ------------------------------+--------------------------------------------- Comment(by css@…): Grabbing the [latest patches http://samba.org/ftp/rsync/src/rsync- patches-3.0.6.tar.gz] fixed the rejection error. There's also a new OS X patch, `osx-xattr-nodev.diff`:
This patch makes the xattr functions skip devices and special files, because OS X returns the wrong errno when getting/setting xattrs on them (it returns EPERM instead of ENOTSUP).
Since we apply the fileflags patch by default for MacOS X, I recommend that we add and apply this one as well. -- Ticket URL: <http://trac.macports.org/ticket/19591#comment:1> MacPorts <http://www.macports.org/> Ports system for Mac OS
#19591: rsync-3.0.6 update -------------------------------+-------------------------------------------- Reporter: css@… | Owner: simon@… Type: update | Status: closed Priority: Normal | Milestone: Component: ports | Version: 1.7.1 Resolution: fixed | Keywords: Port: rsync | -------------------------------+-------------------------------------------- Changes (by simon@…): * status: new => closed * resolution: => fixed Comment: Thanks for your patch, committed in r51032. The osx-xattr-nodev.diff is already included in patch-fileflags.diff so I didn't add it. Simon -- Ticket URL: <http://trac.macports.org/ticket/19591#comment:2> MacPorts <http://www.macports.org/> Ports system for Mac OS
participants (1)
-
MacPorts