Simplified the build instructions now that we have "prepare-source".

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

diff --git a/slp.diff b/slp.diff
index fbc0ab4..c42d6cb 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -2,13 +2,11 @@ This adds Service Location Protocol support.
 
 After applying this patch, run these commands for a successful build:
 
-    autoconf
-    autoheader
+    ./prepare-source
     ./configure --enable-slp
-    make proto
     make
 
---- orig/Makefile.in   2006-01-14 08:14:29
+--- orig/Makefile.in   2006-02-06 05:03:50
 +++ Makefile.in        2006-02-02 00:00:00
 @@ -12,6 +12,8 @@ CFLAGS=@CFLAGS@
  CPPFLAGS=@CPPFLAGS@
@@ -37,9 +35,9 @@ After applying this patch, run these commands for a successful build:
  
  $(OBJS): $(HEADERS)
  
---- orig/clientserver.c        2006-02-01 19:37:05
+--- orig/clientserver.c        2006-02-03 20:41:03
 +++ clientserver.c     2006-02-02 11:32:24
-@@ -832,6 +832,13 @@ int daemon_main(void)
+@@ -836,6 +836,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do inet_ntop on the
         * local address??? */
  
@@ -53,9 +51,9 @@ 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-02 02:41:09
+--- orig/configure.in  2006-02-05 04:53:34
 +++ configure.in       2006-02-02 11:30:00
-@@ -535,6 +535,29 @@ if test $rsync_cv_chown_follows_symlink 
+@@ -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
  
@@ -111,9 +109,9 @@ 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-02 02:41:09
+--- orig/main.c        2006-02-05 04:53:34
 +++ main.c     2006-02-02 11:33:24
-@@ -952,6 +952,18 @@ static int start_client(int argc, char *
+@@ -962,6 +962,18 @@ static int start_client(int argc, char *
        if (!read_batch) { /* for read_batch, NO source is specified */
                argc--;
                shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -132,7 +130,7 @@ 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-02 11:40:45
+--- orig/options.c     2006-02-03 23:51:57
 +++ options.c  2006-02-02 11:41:16
 @@ -195,6 +195,7 @@ static void print_rsync_version(enum log
        char const *hardlinks = "no ";
@@ -165,7 +163,7 @@ 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-02 02:41:09
+--- orig/rsync.h       2006-02-03 20:00:36
 +++ rsync.h    2006-02-02 00:00:00
 @@ -154,6 +154,9 @@
  #define SIGNIFICANT_ITEM_FLAGS (~(\
@@ -177,7 +175,7 @@ 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-01-31 03:05:44
+--- orig/rsync.yo      2006-02-05 15:31:49
 +++ rsync.yo   2006-02-02 10:44:29
 @@ -137,7 +137,12 @@ particular rsync daemon by leaving off t
  
@@ -199,7 +197,7 @@ After applying this patch, run these commands for a successful build:
 +
 +slp refresh = 300
 +
---- orig/rsyncd.conf.yo        2006-01-31 02:30:18
+--- orig/rsyncd.conf.yo        2006-02-03 20:00:36
 +++ rsyncd.conf.yo     2006-02-02 10:40:24
 @@ -119,6 +119,15 @@ details on some of the options you may b
  special socket options are set.  These settings are superseded by the
@@ -217,7 +215,7 @@ After applying this patch, run these commands for a successful build:
  enddit()
  
  
-@@ -540,6 +549,7 @@ use chroot = no
+@@ -541,6 +550,7 @@ use chroot = no
  max connections = 4
  syslog facility = local5
  pid file = /var/run/rsyncd.pid
@@ -225,7 +223,7 @@ After applying this patch, run these commands for a successful build:
  
  [ftp]
          path = /var/ftp/pub
---- orig/socket.c      2006-02-02 02:41:09
+--- orig/socket.c      2006-02-03 20:00:36
 +++ socket.c   2006-02-02 10:28:15
 @@ -447,6 +447,14 @@ void start_accept_loop(int port, int (*f
  {
@@ -240,7 +238,7 @@ After applying this patch, run these commands for a successful build:
 +              slp_timeout -= 15;
 +      }
  
- #if defined HAVE_SIGACTION && defined HAVE_SIGPROCMASK
+ #ifdef HAVE_SIGACTION
        sigact.sa_flags = SA_NOCLDSTOP;
 @@ -475,14 +483,20 @@ void start_accept_loop(int port, int (*f
                        maxfd = sp[i];