[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Sat Aug 8 22:05:41 UTC 2015
The branch, master has been updated
via f8d2ecd Preparing for release of 3.1.2pre1
via 453914e Update the copyright year.
via 3f26e38 Mention latest fixes.
from 81d1ca0 Don't create so many empty backup dirs. Fixes bug 10724.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f8d2ecd223eedabdf3174762b64c77cb01cc403b
Author: Wayne Davison <wayned at samba.org>
Date: Sat Aug 8 12:47:35 2015 -0700
Preparing for release of 3.1.2pre1
commit 453914e35be64ae91ff9863f95c025d1bf66623b
Author: Wayne Davison <wayned at samba.org>
Date: Sat Aug 8 12:47:03 2015 -0700
Update the copyright year.
commit 3f26e38f86caaf9c846a0297d867f298416843b4
Author: Wayne Davison <wayned at samba.org>
Date: Sat Aug 8 12:28:55 2015 -0700
Mention latest fixes.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 19 ++++++++++++++++---
OLDNEWS | 1 +
access.c | 2 +-
acls.c | 2 +-
authenticate.c | 2 +-
backup.c | 2 +-
batch.c | 2 +-
byteorder.h | 2 +-
case_N.h | 2 +-
checksum.c | 2 +-
chmod.c | 2 +-
cleanup.c | 2 +-
clientname.c | 2 +-
clientserver.c | 2 +-
compat.c | 2 +-
configure.ac | 2 +-
delete.c | 2 +-
errcode.h | 2 +-
exclude.c | 2 +-
fileio.c | 2 +-
flist.c | 2 +-
generator.c | 2 +-
getgroups.c | 2 +-
hashtable.c | 2 +-
hlink.c | 2 +-
ifuncs.h | 2 +-
inums.h | 2 +-
io.c | 2 +-
io.h | 2 +-
itypes.h | 2 +-
lib/compat.c | 2 +-
lib/mdfour.c | 2 +-
lib/permstring.c | 2 +-
lib/sysacls.c | 2 +-
lib/sysacls.h | 2 +-
lib/sysxattrs.c | 2 +-
loadparm.c | 2 +-
log.c | 2 +-
main.c | 2 +-
match.c | 2 +-
options.c | 4 ++--
packaging/lsb/rsync.spec | 12 ++++++------
pipe.c | 2 +-
progress.c | 2 +-
receiver.c | 2 +-
rounding.c | 2 +-
rsync.c | 2 +-
rsync.h | 2 +-
rsync.yo | 4 ++--
rsyncd.conf.yo | 4 ++--
sender.c | 2 +-
socket.c | 2 +-
syscall.c | 2 +-
t_stub.c | 2 +-
t_unsafe.c | 2 +-
tls.c | 2 +-
token.c | 2 +-
trimslash.c | 2 +-
uidlist.c | 2 +-
util.c | 2 +-
util2.c | 2 +-
wildtest.c | 2 +-
xattrs.c | 2 +-
63 files changed, 86 insertions(+), 72 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index 0c02d82..b4e92f4 100644
--- a/NEWS
+++ b/NEWS
@@ -2,13 +2,24 @@ NEWS for rsync 3.1.2 (UNRELEASED)
Protocol: 31 (unchanged)
Changes since 3.1.1:
+ SECURITY FIXES:
+
+ - Make sure that all transferred files use only path names from inside the
+ transfer. This makes it impossible for a malicious sender to try to make
+ the receiver use an unsafe destination path for a transferred file, such
+ as a just-sent symlink.
+
BUG FIXES:
- - Make sure that an inc-recursive transfer includes the right directory-
- name prefixes for each dir. This makes it impossible for a malicious
- sender to use a just-sent symlink as a path in a transfer.
+ - Change the checksum seed order in the per-block checksums. This prevents
+ someone from trying to create checksum blocks that match in sum but not
+ content.
+ - Fixed a with the per-dir filter files (using -FF) that could trigger an
+ assert failure.
- Only skip set_modtime() on a transferred file if the time is exactly
right.
+ - Don't create an empty backup dir for a transferred file that doesn't
+ exist yet.
ENHANCEMENTS:
@@ -21,4 +32,6 @@ Changes since 3.1.1:
DEVELOPER RELATED:
- Fixed a bug with the Makefile's use of INSTALL_STRIP.
+ - Improve a test in the suite that could get an erroneous timestamp error.
- Tweaks for newer versions of git in the packaging tools.
+ - Improved the m4 generation rules and some autoconf idioms.
diff --git a/OLDNEWS b/OLDNEWS
index b0b01fb..5a33d7a 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3650,6 +3650,7 @@ Changes since 2.4.6:
Partial Protocol History
RELEASE DATE VER. DATE OF COMMIT* PROTOCOL
+ ?? Aug 2015 3.1.2 31
22 Jun 2014 3.1.1 31
28 Sep 2013 3.1.0 31 Aug 2008 31
23 Sep 2011 3.0.9 30
diff --git a/access.c b/access.c
index df89d6d..edfbe4f 100644
--- a/access.c
+++ b/access.c
@@ -2,7 +2,7 @@
* Routines to authenticate access to a daemon (hosts allow/deny).
*
* Copyright (C) 1998 Andrew Tridgell
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/acls.c b/acls.c
index ec1afc4..007ba29 100644
--- a/acls.c
+++ b/acls.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2006-2014 Wayne Davison
+ * Copyright (C) 2006-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/authenticate.c b/authenticate.c
index c92746c..fe1e839 100644
--- a/authenticate.c
+++ b/authenticate.c
@@ -2,7 +2,7 @@
* Support rsync daemon authentication.
*
* Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2002-2014 Wayne Davison
+ * Copyright (C) 2002-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/backup.c b/backup.c
index 7ee73e4..fcc1a72 100644
--- a/backup.c
+++ b/backup.c
@@ -2,7 +2,7 @@
* Backup handling code.
*
* Copyright (C) 1999 Andrew Tridgell
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/batch.c b/batch.c
index 5b329ba..42f7be1 100644
--- a/batch.c
+++ b/batch.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1999 Weiss
* Copyright (C) 2004 Chris Shoemaker
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/byteorder.h b/byteorder.h
index 49c358b..630f830 100644
--- a/byteorder.h
+++ b/byteorder.h
@@ -2,7 +2,7 @@
* Simple byteorder handling.
*
* Copyright (C) 1992-1995 Andrew Tridgell
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/case_N.h b/case_N.h
index 72451a9..2b8ec66 100644
--- a/case_N.h
+++ b/case_N.h
@@ -1,7 +1,7 @@
/*
* Allow an arbitrary sequence of case labels.
*
- * Copyright (C) 2006-2014 Wayne Davison
+ * Copyright (C) 2006-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/checksum.c b/checksum.c
index 933b514..6ebb56b 100644
--- a/checksum.c
+++ b/checksum.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/chmod.c b/chmod.c
index 1f73958..f39f4c9 100644
--- a/chmod.c
+++ b/chmod.c
@@ -2,7 +2,7 @@
* Implement the core of the --chmod option.
*
* Copyright (C) 2002 Scott Howard
- * Copyright (C) 2005-2014 Wayne Davison
+ * Copyright (C) 2005-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/cleanup.c b/cleanup.c
index 03c7646..cf01681 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/clientname.c b/clientname.c
index ccd43d7..89ce2a8 100644
--- a/clientname.c
+++ b/clientname.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1992-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2002-2014 Wayne Davison
+ * Copyright (C) 2002-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/clientserver.c b/clientserver.c
index d9b5bb0..3f720b0 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 2001-2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2002-2014 Wayne Davison
+ * Copyright (C) 2002-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/compat.c b/compat.c
index 1df1db8..c792312 100644
--- a/compat.c
+++ b/compat.c
@@ -3,7 +3,7 @@
*
* Copyright (C) Andrew Tridgell 1996
* Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index a9e76c5..3aca2a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([rsync],[3.1.2dev],[http://rsync.samba.org/bugzilla.html])
+AC_INIT([rsync],[3.1.2pre1],[http://rsync.samba.org/bugzilla.html])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([byteorder.h])
diff --git a/delete.c b/delete.c
index 2927a93..88e4230 100644
--- a/delete.c
+++ b/delete.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/errcode.h b/errcode.h
index a428b89..f493bf6 100644
--- a/errcode.h
+++ b/errcode.h
@@ -2,7 +2,7 @@
* Error codes returned by rsync.
*
* Copyright (C) 1998-2000 Andrew Tridgell
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/exclude.c b/exclude.c
index 6c7330e..0aaa19b 100644
--- a/exclude.c
+++ b/exclude.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2001 Andrew Tridgell <tridge at samba.org>
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/fileio.c b/fileio.c
index abef46d..70e079d 100644
--- a/fileio.c
+++ b/fileio.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/flist.c b/flist.c
index 0817a4a..c1e48b3 100644
--- a/flist.c
+++ b/flist.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2002-2014 Wayne Davison
+ * Copyright (C) 2002-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/generator.c b/generator.c
index e3fc284..3a4504f 100644
--- a/generator.c
+++ b/generator.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/getgroups.c b/getgroups.c
index bacb21b..b2139b4 100644
--- a/getgroups.c
+++ b/getgroups.c
@@ -3,7 +3,7 @@
* `id -G` on Linux, but it's too hard to find a portable equivalent.
*
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3 as
diff --git a/hashtable.c b/hashtable.c
index 5cdcf61..f0fbe51 100644
--- a/hashtable.c
+++ b/hashtable.c
@@ -1,7 +1,7 @@
/*
* Routines to provide a memory-efficient hashtable.
*
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/hlink.c b/hlink.c
index 3b57898..c257ecf 100644
--- a/hlink.c
+++ b/hlink.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/ifuncs.h b/ifuncs.h
index 6b119aa..158c538 100644
--- a/ifuncs.h
+++ b/ifuncs.h
@@ -1,6 +1,6 @@
/* Inline functions for rsync.
*
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/inums.h b/inums.h
index 3980b7a..7561ec5 100644
--- a/inums.h
+++ b/inums.h
@@ -1,6 +1,6 @@
/* Inline functions for rsync.
*
- * Copyright (C) 2008-2014 Wayne Davison
+ * Copyright (C) 2008-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/io.c b/io.c
index 01c6db1..ef70d67 100644
--- a/io.c
+++ b/io.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996-2001 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/io.h b/io.h
index 14c8489..92e0157 100644
--- a/io.h
+++ b/io.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/itypes.h b/itypes.h
index 3949087..fd3d252 100644
--- a/itypes.h
+++ b/itypes.h
@@ -1,6 +1,6 @@
/* Inline functions for rsync.
*
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/compat.c b/lib/compat.c
index dfe963c..44b2c54 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1998 Andrew Tridgell
* Copyright (C) 2002 Martin Pool
- * Copyright (C) 2004-2014 Wayne Davison
+ * Copyright (C) 2004-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/mdfour.c b/lib/mdfour.c
index 16b2358..fd2760a 100644
--- a/lib/mdfour.c
+++ b/lib/mdfour.c
@@ -4,7 +4,7 @@
* An implementation of MD4 designed for use in the SMB authentication protocol.
*
* Copyright (C) 1997-1998 Andrew Tridgell
- * Copyright (C) 2005-2014 Wayne Davison
+ * Copyright (C) 2005-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/permstring.c b/lib/permstring.c
index 7b2414d..a3a9d1c 100644
--- a/lib/permstring.c
+++ b/lib/permstring.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/sysacls.c b/lib/sysacls.c
index 6ccfe43..e11a988 100644
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -2,7 +2,7 @@
* Unix SMB/CIFS implementation.
* Based on the Samba ACL support code.
* Copyright (C) Jeremy Allison 2000.
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* The permission functions have been changed to get/set all bits via
* one call. Some functions that rsync doesn't need were also removed.
diff --git a/lib/sysacls.h b/lib/sysacls.h
index 31c4909..68ea983 100644
--- a/lib/sysacls.h
+++ b/lib/sysacls.h
@@ -3,7 +3,7 @@
* Version 2.2.x
* Portable SMB ACL interface
* Copyright (C) Jeremy Allison 2000
- * Copyright (C) 2007-2014 Wayne Davison
+ * Copyright (C) 2007-2015 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/lib/sysxattrs.c b/lib/sysxattrs.c
index f02802a..e22467d 100644
--- a/lib/sysxattrs.c
+++ b/lib/sysxattrs.c
@@ -2,7 +2,7 @@
* Extended attribute support for rsync.
*
* Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2003-2014 Wayne Davison
+ * Copyright (C) 2003-2015 Wayne Davison
* Written by Jay Fenlason.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/loadparm.c b/loadparm.c
index a37bbae..6d75b4d 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -17,7 +17,7 @@
* and Karl Auer. Some of the changes are:
*
* Copyright (C) 2001, 2002 Martin Pool <mbp at samba.org>
- * Copyright (C) 2003-2014 Wayne Davison <wayned at samba.org>
+ * Copyright (C) 2003-2015 Wayne Davison <wayned at samba.org>
*/
/* Load parameters.
--
The rsync repository.
More information about the rsync-cvs
mailing list