Opened 16 years ago
Closed 16 years ago
#19591 closed update (fixed)
rsync-3.0.6 update
Reported by: | cssdev | Owned by: | simon@… |
---|---|---|---|
Priority: | Normal | Milestone: | |
Component: | ports | Version: | 1.7.1 |
Keywords: | Cc: | ||
Port: | rsync |
Description
rsync 3.0.6 has been 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.
Attachments (1)
Change History (3)
comment:1 Changed 16 years ago by cssdev
Changed 16 years ago by cssdev
Attachment: | patch-rsync306.diff added |
---|
patch to update version, checksums, and patches to rsync-3.0.6
comment:2 Changed 16 years ago by simon@…
Resolution: | → fixed |
---|---|
Status: | new → closed |
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
Note: See
TracTickets for help on using
tickets.
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
:Since we apply the fileflags patch by default for MacOS X, I recommend that we add and apply this one as well.