Files
haikuports/net-misc/rsync/patches/rsync-3.2.7.patchset
2023-06-03 19:16:57 +02:00

65 lines
2.0 KiB
Plaintext

From 8dcc4c2640a1910bbc4aeb2a2ac1d2e5173bbbb4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 25 Dec 2015 22:07:28 +0000
Subject: Haiku patch
diff --git a/configure.ac b/configure.ac
index a2c9955..14ae117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -697,6 +697,9 @@ if test x"$ac_cv_func_connect" = x"no"; then
fi
AC_SEARCH_LIBS(inet_ntop, resolv)
+AC_SEARCH_LIBS(socket, network)
+AC_SEARCH_LIBS(getpass, bsd)
+AC_SEARCH_LIBS(getxattr, gnu)
# 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
@@ -1410,6 +1413,12 @@ else
AC_DEFINE(SUPPORT_XATTRS, 1)
AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs])
;;
+ *haiku*)
+ AC_MSG_RESULT(Using Linux xattrs)
+ 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])
+ ;;
*)
if test x"$enable_xattr_support" = x"yes"; then
AC_MSG_ERROR(Failed to find extended attribute support)
diff --git a/rsync.h b/rsync.h
index d3709fe..8282d62 100644
--- a/rsync.h
+++ b/rsync.h
@@ -486,7 +486,9 @@ enum delret {
#define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor)
#else
#ifndef __TANDEM
-#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor)
+#define MAKEDEV(devmajor,devminor) ((dev_t)0)
+#define major(dev) (0)
+#define minor(dev) (0)
#else
# define major DEV_TO_MAJOR
# define minor DEV_TO_MINOR
diff --git a/testsuite/hands.test b/testsuite/hands.test
index 8e265b7..610ae79 100644
--- a/testsuite/hands.test
+++ b/testsuite/hands.test
@@ -15,7 +15,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
-ln "$fromdir/filelist" "$fromdir/dir"
+cp -p "$fromdir/filelist" "$fromdir/dir"
runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
rm "$todir/text"
--
2.37.3