Updated to apply cleanly.

[rsync/rsync-patches.git] / slp.diff

diff --git a/slp.diff b/slp.diff
index 06c2ee2..3a9e5ee 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -53,7 +53,7 @@ After applying this patch, run these commands for a successful build:
                int fd;
 --- old/configure.in
 +++ new/configure.in
-@@ -518,6 +518,29 @@ if test $rsync_cv_chown_follows_symlink 
+@@ -522,6 +522,29 @@ if test $rsync_cv_chown_follows_symlink 
    AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])
  fi
  
@@ -132,7 +132,7 @@ After applying this patch, run these commands for a successful build:
                        int dummy2;
 --- old/options.c
 +++ new/options.c
-@@ -195,6 +195,7 @@ static void print_rsync_version(enum log
+@@ -196,6 +196,7 @@ static void print_rsync_version(enum log
        char const *hardlinks = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
@@ -140,7 +140,7 @@ After applying this patch, run these commands for a successful build:
        STRUCT_STAT *dumstat;
  
  #ifdef HAVE_SOCKETPAIR
-@@ -217,6 +218,10 @@ static void print_rsync_version(enum log
+@@ -218,6 +219,10 @@ static void print_rsync_version(enum log
        ipv6 = "";
  #endif
  
@@ -151,7 +151,7 @@ After applying this patch, run these commands for a successful build:
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -229,9 +234,9 @@ static void print_rsync_version(enum log
+@@ -230,9 +235,9 @@ static void print_rsync_version(enum log
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
         * macros. */
@@ -215,7 +215,7 @@ After applying this patch, run these commands for a successful build:
  enddit()
  
  
-@@ -541,6 +550,7 @@ use chroot = no
+@@ -544,6 +553,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid