Changed the style of the diff headers (use "patch -p1" now).

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

diff --git a/slp.diff b/slp.diff
index c42d6cb..06c2ee2 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -6,8 +6,8 @@ After applying this patch, run these commands for a successful build:
     ./configure --enable-slp
     make
 
---- orig/Makefile.in   2006-02-06 05:03:50
-+++ Makefile.in        2006-02-02 00:00:00
+--- old/Makefile.in
++++ new/Makefile.in
 @@ -12,6 +12,8 @@ CFLAGS=@CFLAGS@
  CPPFLAGS=@CPPFLAGS@
  EXEEXT=@EXEEXT@
@@ -35,8 +35,8 @@ After applying this patch, run these commands for a successful build:
  
  $(OBJS): $(HEADERS)
  
---- orig/clientserver.c        2006-02-03 20:41:03
-+++ clientserver.c     2006-02-02 11:32:24
+--- old/clientserver.c
++++ new/clientserver.c
 @@ -836,6 +836,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do inet_ntop on the
         * local address??? */
@@ -51,8 +51,8 @@ After applying this patch, run these commands for a successful build:
        if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
                char pidbuf[16];
                int fd;
---- orig/configure.in  2006-02-05 04:53:34
-+++ configure.in       2006-02-02 11:30:00
+--- old/configure.in
++++ new/configure.in
 @@ -518,6 +518,29 @@ if test $rsync_cv_chown_follows_symlink 
    AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, [Define to 1 if chown modifies symlinks.])
  fi
@@ -83,8 +83,8 @@ After applying this patch, run these commands for a successful build:
  AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
  AC_TRY_RUN([
  #include <sys/types.h>
---- orig/loadparm.c    2006-01-30 21:47:45
-+++ loadparm.c 2006-02-02 10:38:12
+--- old/loadparm.c
++++ new/loadparm.c
 @@ -105,6 +105,7 @@ typedef struct
        char *socket_options;
  
@@ -109,8 +109,8 @@ After applying this patch, run these commands for a successful build:
  FN_GLOBAL_INTEGER(lp_syslog_facility, &Globals.syslog_facility)
  
  FN_LOCAL_STRING(lp_auth_users, auth_users)
---- orig/main.c        2006-02-05 04:53:34
-+++ main.c     2006-02-02 11:33:24
+--- old/main.c
++++ new/main.c
 @@ -962,6 +962,18 @@ static int start_client(int argc, char *
        if (!read_batch) { /* for read_batch, NO source is specified */
                argc--;
@@ -130,8 +130,8 @@ After applying this patch, run these commands for a successful build:
                if (shell_path) { /* source is remote */
                        char *dummy1;
                        int dummy2;
---- orig/options.c     2006-02-03 23:51:57
-+++ options.c  2006-02-02 11:41:16
+--- old/options.c
++++ new/options.c
 @@ -195,6 +195,7 @@ static void print_rsync_version(enum log
        char const *hardlinks = "no ";
        char const *links = "no ";
@@ -163,8 +163,8 @@ After applying this patch, run these commands for a successful build:
                (int) (sizeof dumstat->st_ino * 8),
                (int) (sizeof (int64) * 8));
  #ifdef MAINTAINER_MODE
---- orig/rsync.h       2006-02-03 20:00:36
-+++ rsync.h    2006-02-02 00:00:00
+--- old/rsync.h
++++ new/rsync.h
 @@ -154,6 +154,9 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
        ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
@@ -175,8 +175,8 @@ After applying this patch, run these commands for a successful build:
  
  /* Log-message categories.  Only FERROR and FINFO get sent over the socket.
   * FLOG and FCLIENT are only used on the daemon side for custom logging,
---- orig/rsync.yo      2006-02-05 15:31:49
-+++ rsync.yo   2006-02-02 10:44:29
+--- old/rsync.yo
++++ new/rsync.yo
 @@ -137,7 +137,12 @@ particular rsync daemon by leaving off t
  
  quote(tt(rsync somehost.mydomain.com::))
@@ -191,14 +191,14 @@ After applying this patch, run these commands for a successful build:
  
  manpagesection(ADVANCED USAGE)
  
---- orig/rsyncd.conf   2006-02-02 00:00:00
-+++ rsyncd.conf        2006-02-02 00:00:00
+--- old/rsyncd.conf
++++ new/rsyncd.conf
 @@ -0,0 +1,3 @@
 +
 +slp refresh = 300
 +
---- orig/rsyncd.conf.yo        2006-02-03 20:00:36
-+++ rsyncd.conf.yo     2006-02-02 10:40:24
+--- old/rsyncd.conf.yo
++++ new/rsyncd.conf.yo
 @@ -119,6 +119,15 @@ details on some of the options you may b
  special socket options are set.  These settings are superseded by the
  bf(--sockopts) command-line option.
@@ -223,8 +223,8 @@ After applying this patch, run these commands for a successful build:
  
  [ftp]
          path = /var/ftp/pub
---- orig/socket.c      2006-02-03 20:00:36
-+++ socket.c   2006-02-02 10:28:15
+--- old/socket.c
++++ new/socket.c
 @@ -447,6 +447,14 @@ void start_accept_loop(int port, int (*f
  {
        fd_set deffds;
@@ -277,8 +277,8 @@ After applying this patch, run these commands for a successful build:
                        continue;
  
                for (i = 0, fd = -1; sp[i] >= 0; i++) {
---- orig/srvloc.c      2006-02-02 11:19:54
-+++ srvloc.c   2006-02-02 11:19:54
+--- old/srvloc.c
++++ new/srvloc.c
 @@ -0,0 +1,105 @@
 +/* -*- c-file-style: "linux"; -*-
 +
@@ -385,8 +385,8 @@ After applying this patch, run these commands for a successful build:
 +
 +      return 0;
 +}
---- orig/srvreg.c      2006-02-02 11:20:37
-+++ srvreg.c   2006-02-02 11:20:37
+--- old/srvreg.c
++++ new/srvreg.c
 @@ -0,0 +1,128 @@
 +/* -*- c-file-style: "linux"; -*-
 +