- updated; exclude already merged

Changed files:
    rsync-config.patch -> 1.14
    rsync-exclude.patch -> 1.2

diff --git a/rsync-config.patch b/rsync-config.patch
index 6aba03dbf88a31f27185fe14402421695eef45c7..0efd659bb2a5b464d9fcff34083dcf0dd4468449 100644 (file)
--- a/rsync-config.patch
+++ b/rsync-config.patch
@@ -1,6 +1,6 @@
-diff -ur rsync-2.6.7.org/rsyncd.conf.5 rsync-2.6.7/rsyncd.conf.5
---- rsync-2.6.7.org/rsyncd.conf.5      2006-03-11 19:25:08.000000000 +0100
-+++ rsync-2.6.7/rsyncd.conf.5  2006-03-11 21:37:33.616778500 +0100
+diff -urN rsync-2.6.8.org/rsyncd.conf.5 rsync-2.6.8/rsyncd.conf.5
+--- rsync-2.6.8.org/rsyncd.conf.5      2006-04-22 17:38:38.000000000 +0200
++++ rsync-2.6.8/rsyncd.conf.5  2006-04-22 18:45:54.300539750 +0200
 @@ -344,7 +344,7 @@
  you may find that passwords longer than 8 characters don\&'t work\&. 
  .IP 
@@ -35,9 +35,9 @@ diff -ur rsync-2.6.7.org/rsyncd.conf.5 rsync-2.6.7/rsyncd.conf.5
  .PP 
  .SH "SEE ALSO" 
  .PP 
-diff -ur rsync-2.6.7.org/rsyncd.conf.yo rsync-2.6.7/rsyncd.conf.yo
---- rsync-2.6.7.org/rsyncd.conf.yo     2006-03-11 19:25:04.000000000 +0100
-+++ rsync-2.6.7/rsyncd.conf.yo 2006-03-11 21:37:33.616778500 +0100
+diff -urN rsync-2.6.8.org/rsyncd.conf.yo rsync-2.6.8/rsyncd.conf.yo
+--- rsync-2.6.8.org/rsyncd.conf.yo     2006-04-22 17:38:34.000000000 +0200
++++ rsync-2.6.8/rsyncd.conf.yo 2006-04-22 18:45:54.300539750 +0200
 @@ -66,7 +66,7 @@
  reread its config file.
  
@@ -78,9 +78,9 @@ diff -ur rsync-2.6.7.org/rsyncd.conf.yo rsync-2.6.7/rsyncd.conf.yo
  
  quote(
  tt(tridge:mypass)nl()
-diff -ur rsync-2.6.7.org/rsync.h rsync-2.6.7/rsync.h
---- rsync-2.6.7.org/rsync.h    2006-03-11 21:37:15.251630000 +0100
-+++ rsync-2.6.7/rsync.h        2006-03-11 21:37:33.616778500 +0100
+diff -urN rsync-2.6.8.org/rsync.h rsync-2.6.8/rsync.h
+--- rsync-2.6.8.org/rsync.h    2006-04-13 18:53:15.000000000 +0200
++++ rsync-2.6.8/rsync.h        2006-04-22 18:45:54.300539750 +0200
 @@ -30,7 +30,7 @@
  /* RSYNCD_SYSCONF is now set in config.h */
  #define RSYNCD_USERCONF "rsyncd.conf"
@@ -90,19 +90,28 @@ diff -ur rsync-2.6.7.org/rsync.h rsync-2.6.7/rsync.h
  #define URL_PREFIX "rsync://"
  
  #define BACKUP_SUFFIX "~"
-diff -ur rsync-2.6.7.org/rsync.yo rsync-2.6.7/rsync.yo
---- rsync-2.6.7.org/rsync.yo   2006-03-11 21:37:15.267631000 +0100
-+++ rsync-2.6.7/rsync.yo       2006-03-11 21:37:33.616778500 +0100
-@@ -1749,7 +1749,7 @@
+diff -urN rsync-2.6.8.org/rsync.yo rsync-2.6.8/rsync.yo
+--- rsync-2.6.8.org/rsync.yo   2006-04-22 17:38:34.000000000 +0200
++++ rsync-2.6.8/rsync.yo       2006-04-22 18:47:01.752755250 +0200
+@@ -1747,7 +1747,7 @@
  If standard input is a socket then rsync will assume that it is being
  run via inetd, otherwise it will detach from the current terminal and
  become a background daemon.  The daemon will read the config file
 -(rsyncd.conf) on each connect made by a client and respond to
 +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
- requests accordingly.  See the rsyncd.conf(5) man page for more
+ requests accordingly.  See the bf(rsyncd.conf)(5) man page for more
  details.
  
-@@ -2477,7 +2477,7 @@
+@@ -1765,7 +1765,7 @@
+ 
+ dit(bf(--config=FILE)) This specifies an alternate config file than
+ the default.  This is only relevant when bf(--daemon) is specified.
+-The default is /etc/rsyncd.conf unless the daemon is running over
++The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
+ a remote shell program and the remote user is not the super-user; in that case
+ the default is rsyncd.conf in the current directory (typically $HOME).
+ 
+@@ -2475,7 +2475,7 @@
  
  manpagefiles()
  

diff --git a/rsync-exclude.patch b/rsync-exclude.patch
deleted file mode 100644 (file)
index 894d077..0000000
--- a/rsync-exclude.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exclude.c  28 Jan 2006 00:14:02 -0000      1.128
-+++ exclude.c  13 Mar 2006 01:49:56 -0000
-@@ -562,7 +562,7 @@ static int rule_matches(char *name, stru
-               if (litmatch_array(pattern, strings, slash_handling))
-                       return ret_match;
-       } else if (anchored_match) {
--              if (strcmp(name,pattern) == 0)
-+              if (strcmp(strings[0], pattern) == 0)
-                       return ret_match;
-       } else {
-               int l1 = strlen(name);