Update rsync patch to allow symlink attributes

This commit is contained in:
Chris Roberts
2013-10-24 14:35:44 -06:00
parent 5deea2bf0a
commit 1242d4ef47
2 changed files with 18 additions and 19 deletions

View File

@@ -1,7 +1,7 @@
diff -Naur rsync-3.1.0/configure.ac rsync-3.1.0-haiku/configure.ac
--- rsync-3.1.0/configure.ac 2013-09-28 14:55:54.057409536 -0600
+++ rsync-3.1.0-haiku/configure.ac 2013-10-09 19:17:25.484704256 -0600
@@ -455,6 +455,9 @@
diff -up rsync-3.1.0/configure.ac.orig rsync-3.1.0/configure.ac
--- rsync-3.1.0/configure.ac.orig 2013-09-28 14:55:54.062914560 -0600
+++ rsync-3.1.0/configure.ac 2013-10-24 14:27:24.333709312 -0600
@@ -455,6 +455,9 @@ if test x"$ac_cv_func_connect" = x"no";
fi
AC_SEARCH_LIBS(inet_ntop, resolv)
@@ -11,7 +11,7 @@ diff -Naur rsync-3.1.0/configure.ac rsync-3.1.0-haiku/configure.ac
# For OS X, Solaris, HP-UX, etc.: figure out if -liconv is needed. We'll
# accept either iconv_open or libiconv_open, since some include files map
@@ -1079,6 +1082,13 @@
@@ -1079,6 +1082,12 @@ else
AC_DEFINE(SUPPORT_XATTRS, 1)
AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs])
;;
@@ -20,15 +20,14 @@ diff -Naur rsync-3.1.0/configure.ac rsync-3.1.0-haiku/configure.ac
+ AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
+ AC_DEFINE(SUPPORT_XATTRS, 1)
+ AC_DEFINE(NO_DEVICE_XATTRS, 1, [True if device files do not support xattrs])
+ AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs])
+ ;;
*)
if test x"$enable_xattr_support" = x"yes"; then
AC_MSG_ERROR(Failed to find extended attribute support)
diff -Naur rsync-3.1.0/rsync.h rsync-3.1.0-haiku/rsync.h
--- rsync-3.1.0/rsync.h 2013-09-28 14:55:54.063700992 -0600
+++ rsync-3.1.0-haiku/rsync.h 2013-10-09 18:36:27.000262144 -0600
@@ -442,7 +442,9 @@
diff -up rsync-3.1.0/rsync.h.orig rsync-3.1.0/rsync.h
--- rsync-3.1.0/rsync.h.orig 2013-09-28 14:55:54.002359296 -0600
+++ rsync-3.1.0/rsync.h 2013-10-24 14:27:08.025165824 -0600
@@ -442,7 +442,9 @@ enum delret {
#ifdef MAKEDEV_TAKES_3_ARGS
#define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor)
#else
@@ -39,10 +38,10 @@ diff -Naur rsync-3.1.0/rsync.h rsync-3.1.0-haiku/rsync.h
#endif
#ifdef HAVE_COMPAT_H
diff -Naur rsync-3.1.0/testsuite/hands.test rsync-3.1.0-haiku/testsuite/hands.test
--- rsync-3.1.0/testsuite/hands.test 2008-07-20 23:28:19.061079552 -0600
+++ rsync-3.1.0-haiku/testsuite/hands.test 2013-10-09 18:36:57.847511552 -0600
@@ -15,7 +15,7 @@
diff -up rsync-3.1.0/testsuite/hands.test.orig rsync-3.1.0/testsuite/hands.test
--- rsync-3.1.0/testsuite/hands.test.orig 2008-07-20 23:28:19.066584576 -0600
+++ rsync-3.1.0/testsuite/hands.test 2013-10-24 14:27:08.049283072 -0600
@@ -15,7 +15,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
@@ -51,10 +50,10 @@ diff -Naur rsync-3.1.0/testsuite/hands.test rsync-3.1.0-haiku/testsuite/hands.te
runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
rm "$todir/text"
diff -Naur rsync-3.1.0/testsuite/relative.test rsync-3.1.0-haiku/testsuite/relative.test
--- rsync-3.1.0/testsuite/relative.test 2007-09-22 20:18:57.062914560 -0600
+++ rsync-3.1.0-haiku/testsuite/relative.test 2013-10-09 18:37:31.927727616 -0600
@@ -31,8 +31,8 @@
diff -up rsync-3.1.0/testsuite/relative.test.orig rsync-3.1.0/testsuite/relative.test
--- rsync-3.1.0/testsuite/relative.test.orig 2007-09-22 20:18:57.001310720 -0600
+++ rsync-3.1.0/testsuite/relative.test 2013-10-24 14:27:08.052690944 -0600
@@ -31,8 +31,8 @@ $RSYNC -ai --include=/down/ --exclude='/
sleep 1
runtest "basic relative" 'checkit "$RSYNC -avR ./$deepstr \"$todir\"" "$chkdir" "$todir"'

View File

@@ -11,7 +11,7 @@ SRC_URI="http://rsync.samba.org/ftp/rsync/src/rsync-3.1.0.tar.gz"
CHECKSUM_MD5="3be148772a33224771a8d4d2a028b132"
LICENSE="GNU GPL v3"
COPYRIGHT="1996-2013 by Andrew Tridgell, Wayne Davison, and others."
REVISION="1"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86"
PATCHES="rsync-3.1.0.patch"