Adding filter-attribute-mods patch; updating patches.

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

diff --git a/slp.diff b/slp.diff
index 4284227..7437d50 100644 (file)
--- a/slp.diff
+++ b/slp.diff
@@ -10,8 +10,8 @@ To use this patch, run these commands for a successful build:
 TODO: the configure changes should abort if the user requests --enable-slp
 and we can't honor that request.
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/Makefile.in b/Makefile.in
-index feacb90..09e1547 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -13,6 +13,8 @@ CFLAGS=@CFLAGS@
@@ -42,10 +42,9 @@ index feacb90..09e1547 100644
  $(OBJS): $(HEADERS)
  $(CHECK_OBJS): $(HEADERS)
 diff --git a/clientserver.c b/clientserver.c
-index b6afe00..a242809 100644
 --- a/clientserver.c
 +++ b/clientserver.c
-@@ -1153,6 +1153,13 @@ int daemon_main(void)
+@@ -1147,6 +1147,13 @@ int daemon_main(void)
         * address too.  In fact, why not just do inet_ntop on the
         * local address??? */
  
@@ -60,7 +59,6 @@ index b6afe00..a242809 100644
        return -1;
  }
 diff --git a/configure.in b/configure.in
-index bc7d4a7..f8dc177 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -647,6 +647,29 @@ if test $rsync_cv_can_hardlink_special = yes; then
@@ -94,7 +92,6 @@ index bc7d4a7..f8dc177 100644
  AC_TRY_RUN([
  #include <sys/types.h>
 diff --git a/loadparm.c b/loadparm.c
-index 8e48e6d..a833006 100644
 --- a/loadparm.c
 +++ b/loadparm.c
 @@ -97,6 +97,9 @@ typedef struct {
@@ -128,10 +125,9 @@ index 8e48e6d..a833006 100644
  FN_LOCAL_STRING(lp_auth_users, auth_users)
  FN_LOCAL_STRING(lp_charset, charset)
 diff --git a/main.c b/main.c
-index 2ef2f47..3535264 100644
 --- a/main.c
 +++ b/main.c
-@@ -1195,6 +1195,18 @@ static int start_client(int argc, char *argv[])
+@@ -1207,6 +1207,18 @@ static int start_client(int argc, char *argv[])
  
        if (!read_batch) { /* for read_batch, NO source is specified */
                char *path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
@@ -151,7 +147,6 @@ index 2ef2f47..3535264 100644
                        char *dummy_host;
                        int dummy_port = 0;
 diff --git a/options.c b/options.c
-index e7c6c61..dae5716 100644
 --- a/options.c
 +++ b/options.c
 @@ -566,6 +566,7 @@ static void print_rsync_version(enum logcode f)
@@ -184,7 +179,6 @@ index e7c6c61..dae5716 100644
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
 diff --git a/rsync.h b/rsync.h
-index be7cf8a..8353124 100644
 --- a/rsync.h
 +++ b/rsync.h
 @@ -194,6 +194,10 @@
@@ -199,7 +193,6 @@ index be7cf8a..8353124 100644
  #define CFN_KEEP_TRAILING_SLASH (1<<1)
  #define CFN_DROP_TRAILING_DOT_DIR (1<<2)
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..1518b3f 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -148,7 +148,12 @@ particular rsync daemon by leaving off the module name:
@@ -218,7 +211,6 @@ index 941f7a5..1518b3f 100644
  
 diff --git a/rsyncd.conf b/rsyncd.conf
 new file mode 100644
-index 0000000..971723f
 --- /dev/null
 +++ b/rsyncd.conf
 @@ -0,0 +1,3 @@
@@ -226,7 +218,6 @@ index 0000000..971723f
 +slp refresh = 300
 +
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
-index d4978cd..318f0ec 100644
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
 @@ -108,6 +108,15 @@ details on some of the options you may be able to set. By default no
@@ -254,7 +245,6 @@ index d4978cd..318f0ec 100644
  [ftp]
          path = /var/ftp/./pub
 diff --git a/socket.c b/socket.c
-index 5df3a50..a4a2b0a 100644
 --- a/socket.c
 +++ b/socket.c
 @@ -530,6 +530,16 @@ void start_accept_loop(int port, int (*fn)(int, int))
@@ -322,7 +312,6 @@ index 5df3a50..a4a2b0a 100644
                for (i = 0, fd = -1; sp[i] >= 0; i++) {
 diff --git a/srvloc.c b/srvloc.c
 new file mode 100644
-index 0000000..99eea16
 --- /dev/null
 +++ b/srvloc.c
 @@ -0,0 +1,103 @@
@@ -431,7 +420,6 @@ index 0000000..99eea16
 +}
 diff --git a/srvreg.c b/srvreg.c
 new file mode 100644
-index 0000000..04afe60
 --- /dev/null
 +++ b/srvreg.c
 @@ -0,0 +1,128 @@