[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Mon Sep 27 01:15:09 UTC 2021


The branch, master has been updated
       via  97f4d48a configure improvements
       via  3cc7f0ba Tweak a comment.
       via  dde46951 Minor cleanup (#214)
       via  33379302 add ssl/tls key option (#216)
       via  44cc1489 Fix spelling of nanosecond (#220)
       via  b2e16fac Eventually add write permission when setting extended attributes (#212)
       via  4fd662fe Remove duplicate include.
       via  12c05869 Add gist update logic to gensend target.
       via  33095916 Make use of a git gist instead of the samba website.
       via  5818cf85 Add missing INET6 check.
       via  1fa0bd1e configure.ac: Test IPv6 compatibility instead of relying on library probes (#206)
       via  592c6bc3 add missing - in certopt (#210)
       via  efc81c93 Add test and fix regression for --delay-updates (#192) (#204)
      from  35d4f673 Update the options in rrsync.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 97f4d48a070d5fc2c1286696ee9ef318f9e9a9c5
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Sep 26 18:10:45 2021 -0700

    configure improvements
    
    - Make SIMD & ASM only default to enabled on linux for now (due to
      FreeBSD & MacOS issues).
    - Improve the enable/disable help messages so that they don't look
      wrong when the opposite --enable-X/--disable-X arg is specified.

commit 3cc7f0ba4385e3f108c538e6e6965eefa4769f6c
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Sep 26 17:23:33 2021 -0700

    Tweak a comment.

commit dde469513625c0e10216da9b6f6546aa844431f7
Author: a1346054 <36859588+a1346054 at users.noreply.github.com>
Date:   Sun Sep 26 23:57:55 2021 +0000

    Minor cleanup (#214)
    
    - use `grep -E` and `grep -F` (`egrep` and `fgrep` are non-standard)
    - use same hashbang style for all test scripts
    - use explicit comparisons in test scripts
    - remove redundant ; from test scripts
    - make test script not executable, just like all the other scripts
    - unify codestyle across all test scripts
    - make openssl license exception clearer by having it at the top
    - use modern links in COPYING. The text now matches:
      https://www.gnu.org/licenses/gpl-3.0.txt
    - fix typo

commit 33379302927313f426fc561ce2c89069e265b9a3
Author: Fabian H <fabolhak at users.noreply.github.com>
Date:   Mon Sep 27 01:44:00 2021 +0200

    add ssl/tls key option (#216)
    
    Improves rsync-ssl configurability.

commit 44cc148907ce3d81d8554c709bea64d9b4d77c25
Author: zgpmax <bill+github.zgpmax at blunn.org>
Date:   Mon Sep 27 00:42:02 2021 +0100

    Fix spelling of nanosecond (#220)
    
    Hyphenating the word just makes it harder to find when nanosecond support was added.

commit b2e16facd43ae035e916b6018a031a23bb54c8ed
Author: TomasKorbar <tomas.korb at seznam.cz>
Date:   Mon Sep 27 01:34:15 2021 +0200

    Eventually add write permission when setting extended attributes (#212)
    
    * Eventually add write permission when setting extended attributes
    
    When we need to set extended atributes of file which does not
    allow write then temporarily add write permission and after
    attributes are set, remove it again.
    
    Resolves #208
    
    Co-authored-by: Wayne Davison <wayne at opencoder.net>

commit 4fd662fea943b02fbcf560322d1928e6f0d50a7c
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Sep 26 16:28:35 2021 -0700

    Remove duplicate include.

commit 12c058698b4ec2b7f0d669c183e81c8bc841eed9
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Sep 26 12:32:47 2021 -0700

    Add gist update logic to gensend target.

commit 33095916ecd471527fb98381df642ea7fb3464ec
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Sep 26 12:09:17 2021 -0700

    Make use of a git gist instead of the samba website.

commit 5818cf85961360fcc555b55c9dab1ddbe92513a3
Author: Wayne Davison <wayne at opencoder.net>
Date:   Sun Sep 26 11:24:24 2021 -0700

    Add missing INET6 check.

commit 1fa0bd1e87030c450026e149ccfa959e066b318a
Author: Jonathan Davies <jd+github at upthedownstair.com>
Date:   Sun Sep 26 19:25:06 2021 +0100

    configure.ac: Test IPv6 compatibility instead of relying on library probes (#206)
    
    Legacy configure behaviour was to detect IPv6 support through known IPv6
    capable version of common standard libraries. Now: it runs a POSIX test
    to determine if IPv6 is usable (in case it has not been disabled).
    
    Patch originally from Pierre-Olivier Mercier <nemunaire at nemunai.re>.
    
    Signed-off-by: Jonathan Davies <jpds at protonmail.com>

commit 592c6bc3e5e93f36c2fdc0a491a9fb43a41cf688
Author: Fabian H <fabolhak at users.noreply.github.com>
Date:   Tue Aug 17 00:52:39 2021 +0200

    add missing - in certopt (#210)
    
    otherwise openssl will give an error and not accept is as argument

commit efc81c93a9fca45ba08119145a2d282f477f01b4
Author: Natanael Copa <ncopa at alpinelinux.org>
Date:   Wed Jul 28 18:10:55 2021 +0200

    Add test and fix regression for --delay-updates (#192) (#204)
    
    Fixes regression introduced with commit 3a7bf54ad520 (A resumed
    partial-dir file is transferred in-place.)

-----------------------------------------------------------------------

Summary of changes:
 .cirrus.yml                   |   2 +-
 .github/workflows/build.yml   |   4 +-
 .gitignore                    |   1 +
 COPYING                       |  26 +++---
 Makefile.in                   |   4 +
 NEWS.md                       |   2 +-
 clientname.c                  |   2 +
 configure.ac                  | 191 +++++++++++++-----------------------------
 receiver.c                    |   2 +-
 rsync-ssl                     |  16 +++-
 rsync-ssl.1.md                |   2 +
 rsync.h                       |   3 +-
 runtests.sh                   |   4 +-
 support/rsync-no-vanished     |   2 +-
 testsuite/00-hello.test       |   2 +-
 testsuite/README.testsuite    |   2 -
 testsuite/acls.test           |  10 +--
 testsuite/atimes.test         |   2 +-
 testsuite/backup.test         |   2 +-
 testsuite/batch-mode.test     |   2 +-
 testsuite/chgrp.test          |   5 +-
 testsuite/chmod-option.test   |   4 +-
 testsuite/chmod-temp-dir.test |   2 +-
 testsuite/chmod.test          |   2 +-
 testsuite/chown.test          |   2 +-
 testsuite/compare-dest.test   |   2 +-
 testsuite/crtimes.test        |   2 +-
 testsuite/default-acls.test   |   4 +-
 testsuite/delay-updates.test  |  21 +++++
 testsuite/delete.test         |   8 +-
 testsuite/devices.test        |   2 +-
 testsuite/dir-sgid.test       |   2 +-
 testsuite/duplicates.test     |  10 +--
 testsuite/exclude.test        |   2 +-
 testsuite/executability.test  |   2 +-
 testsuite/fuzzy.test          |   2 +-
 testsuite/hardlinks.test      |   2 +-
 testsuite/itemize.test        |   2 +-
 testsuite/merge.test          |   2 +-
 testsuite/missing.test        |   2 +-
 testsuite/mkpath.test         |   0
 testsuite/rsync.fns           |  50 +++++------
 testsuite/ssh-basic.test      |   2 +-
 testsuite/symlink-ignore.test |  13 ++-
 testsuite/trimslash.test      |   2 +-
 testsuite/unsafe-byname.test  |   7 +-
 testsuite/unsafe-links.test   |  19 ++---
 testsuite/wildmatch.test      |   2 +-
 testsuite/xattrs.test         |  12 +--
 util1.c                       |   2 +-
 xattrs.c                      |  17 +++-
 51 files changed, 220 insertions(+), 267 deletions(-)
 create mode 100644 testsuite/delay-updates.test
 mode change 100755 => 100644 testsuite/mkpath.test


Changeset truncated at 500 lines:

diff --git a/.cirrus.yml b/.cirrus.yml
index 62b9318c..7842fc2e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -8,7 +8,7 @@ freebsd_task:
     - dd if=/dev/zero of=/tmp/zpool bs=1M count=1024
     - zpool create -m `pwd`/testtmp zpool /tmp/zpool
     - pkg install -y bash autotools m4 xxhash zstd liblz4 wget
-    - wget https://download.samba.org/pub/rsync/generated-files/git-version.h
+    - wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h
   configure_script:
     - CPPFLAGS=-I/usr/local/include/ LDFLAGS=-L/usr/local/lib/ ./configure --disable-md2man
   make_script:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f4d1070..530ec19d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
     - name: prep
       run: |
         sudo apt-get install acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl wget
-        wget https://download.samba.org/pub/rsync/generated-files/git-version.h
+        wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h
         echo "/usr/local/bin" >>$GITHUB_PATH
     - name: configure
       run: ./configure
@@ -56,7 +56,7 @@ jobs:
       run: |
         brew install automake openssl xxhash zstd lz4 wget
         sudo pip3 install commonmark
-        wget https://download.samba.org/pub/rsync/generated-files/git-version.h
+        wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h
         echo "/usr/local/bin" >>$GITHUB_PATH
     - name: configure
       run: CPPFLAGS=-I/usr/local/opt/openssl/include/ LDFLAGS=-L/usr/local/opt/openssl/lib/ ./configure
diff --git a/.gitignore b/.gitignore
index 47d75e91..13c6db8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ aclocal.m4
 /conftest*
 /dox
 /getgroups
+/gists
 /gmon.out
 /rsync
 /stunnel-rsyncd.conf
diff --git a/COPYING b/COPYING
index 104c5831..fb19ef2e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,16 @@
+REGARDING OPENSSL AND XXHASH
+
+In addition, as a special exception, the copyright holders give
+permission to dynamically link rsync with the OpenSSL and xxhash
+libraries when those libraries are being distributed in compliance
+with their license terms, and to distribute a dynamically linked
+combination of rsync and these libraries.  This is also considered
+to be covered under the GPL's System Libraries exception.
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +654,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,20 +673,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-REGARDING OPENSSL AND XXHASH
-
-In addition, as a special exception, the copyright holders give
-permission to dynamically link rsync with the OpenSSL and xxhash
-libraries when those libraries are being distributed in compliance
-with their license terms, and to distribute a dynamically linked
-combination of rsync and these libraries.  This is also considered
-to be covered under the GPL's System Libraries exception.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Makefile.in b/Makefile.in
index 0313e6ff..eeda5fc7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -171,6 +171,10 @@ gen: conf proto.h man git-version.h
 
 .PHONY: gensend
 gensend: gen
+	if ! diff git-version.h $(srcdir)/gists/rsync-git-version.h >/dev/null; then \
+	    ./rsync -ai git-version.h $(srcdir)/gists/rsync-git-version.h && \
+	    (cd $(srcdir)/gists && git commit --allow-empty-message -m '' rsync-git-version.h && git push) ; \
+	fi
 	rsync -aic $(GENFILES) git-version.h $${SAMBA_HOST-samba.org}:/home/ftp/pub/rsync/generated-files/
 
 aclocal.m4: $(srcdir)/m4/*.m4
diff --git a/NEWS.md b/NEWS.md
index bbc1b3fe..832a175b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -915,7 +915,7 @@
    hard-link it into place so that the upcoming replacement of the destination
    file will be atomic (for the normal, non-inplace logic).
 
- - Added the ability to synchronize nano-second modified times.
+ - Added the ability to synchronize nanosecond modified times.
 
  - Added a few more default suffixes for the `dont compress` settings.
 
diff --git a/clientname.c b/clientname.c
index 30e888cd..0222f8eb 100644
--- a/clientname.c
+++ b/clientname.c
@@ -214,11 +214,13 @@ int read_proxy_protocol_header(int fd)
 					return 0;
 				inet_ntop(AF_INET, hdr.v2.addr.ip4.src_addr, ipaddr_buf, sizeof ipaddr_buf);
 				return valid_ipaddr(ipaddr_buf);
+#ifdef INET6
 			case PROXY_FAM_TCPv6:
 				if (size != sizeof hdr.v2.addr.ip6)
 					return 0;
 				inet_ntop(AF_INET6, hdr.v2.addr.ip6.src_addr, ipaddr_buf, sizeof ipaddr_buf);
 				return valid_ipaddr(ipaddr_buf);
+#endif
 			default:
 				break;
 			}
diff --git a/configure.ac b/configure.ac
index 5a8d6d06..9800c84b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_CONFIG_LIBOBJ_DIR([lib])
 
 AC_MSG_CHECKING([whether to include debugging symbols])
 AC_ARG_ENABLE(debug,
-	AS_HELP_STRING([--disable-debug],[disable debugging symbols and features]))
+	AS_HELP_STRING([--disable-debug],[disable to omit debugging symbols and features]))
 
 if test x"$enable_debug" = x"no"; then
     AC_MSG_RESULT(no)
@@ -78,7 +78,7 @@ nl='
 '
 
 AC_ARG_ENABLE(profile,
-	AS_HELP_STRING([--enable-profile],[turn on CPU profiling]))
+	AS_HELP_STRING([--enable-profile],[enable to turn on CPU profiling]))
 if test x"$enable_profile" = x"yes"; then
 	CFLAGS="$CFLAGS -pg"
 fi
@@ -101,7 +101,7 @@ fi
 
 AC_MSG_CHECKING([if we require man-page building])
 AC_ARG_ENABLE([md2man],
-	AS_HELP_STRING([--disable-md2man],[disable md2man for man page creation]))
+	AS_HELP_STRING([--disable-md2man],[disable to omit man page creation]))
 if test x"$enable_md2man" != x"no"; then
     if test -f "$srcdir/rsync.1"; then
 	AC_MSG_RESULT(optional)
@@ -122,7 +122,7 @@ fi
 
 # Specifically, this turns on panic_action handling.
 AC_ARG_ENABLE(maintainer-mode,
-	AS_HELP_STRING([--enable-maintainer-mode],[turn on extra debug features]))
+	AS_HELP_STRING([--enable-maintainer-mode],[enable to turn on extra debug features]))
 if test x"$enable_maintainer_mode" = x"yes"; then
 	CFLAGS="$CFLAGS -DMAINTAINER_MODE"
 fi
@@ -224,7 +224,7 @@ SIMD=
 
 AC_MSG_CHECKING([whether to enable SIMD optimizations])
 AC_ARG_ENABLE(simd,
-    AS_HELP_STRING([--disable-simd],[disable SIMD optimizations (requires c++)]))
+    AS_HELP_STRING([--enable-simd],[enable/disable to control SIMD optimizations (requires c++)]))
 
 # Clag is crashing with -g -O2, so we'll get rid of -g for now.
 CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g //'`
@@ -253,6 +253,13 @@ __attribute__ ((target("ssse3"))) void more_testing(char* buf, int len)
 }
 ]])
 
+if test x"$enable_simd" = x""; then
+    case "$host_os" in
+	*linux*) simd_enable=yes ;;
+	*) simd_enable=no ;;
+    esac
+fi
+
 if test x"$enable_simd" != x"no"; then
     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
     if test x"$host_cpu" = x"x86_64"; then
@@ -309,7 +316,14 @@ ASM=
 
 AC_MSG_CHECKING([whether to enable ASM optimizations])
 AC_ARG_ENABLE(asm,
-    AS_HELP_STRING([--disable-asm],[disable ASM optimizations]))
+    AS_HELP_STRING([--enable-asm],[enable/disable to control ASM optimizations]))
+
+if test x"$enable_asm" = x""; then
+    case "$host_os" in
+	*linux*) asm_enable=yes ;;
+	*) asm_enable=no ;;
+    esac
+fi
 
 if test x"$enable_asm" != x"no"; then
     if test x"$host_cpu" = x"x86_64"; then
@@ -376,132 +390,39 @@ if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then
    AC_SYS_LARGEFILE
 fi
 
-ipv6type=unknown
-ipv6lib=none
-ipv6trylibc=yes
-
+AC_MSG_CHECKING([whether to enable ipv6])
 AC_ARG_ENABLE(ipv6,
-	AS_HELP_STRING([--disable-ipv6],[turn off IPv6 support]))
-if test x"$enable_ipv6" != x"no"; then
-	AC_MSG_CHECKING([ipv6 stack type])
-	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin TANDEM; do
-		case $i in
-		inria)
-			# http://www.kame.net/
-			AC_EGREP_CPP(yes, [
-#include <netinet/in.h>
-#ifdef IPV6_INRIA_VERSION
-yes
-#endif],
-				[ipv6type=$i;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])
-				])
-			;;
-		kame)
-			# http://www.kame.net/
-			AC_EGREP_CPP(yes, [
-#include <netinet/in.h>
-#ifdef __KAME__
-yes
-#endif],
-				[ipv6type=$i;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		linux-glibc)
-			# http://www.v6.linux.or.jp/
-			AC_EGREP_CPP(yes, [
-#include <features.h>
-#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
-yes
-#endif],
-				[ipv6type=$i;
-AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		linux-inet6)
-			# http://www.v6.linux.or.jp/
-			if test -d /usr/inet6 -o -f /usr/inet6/lib/libinet6.a; then
-				ipv6type=$i
-				ipv6lib=inet6
-				ipv6libdir=/usr/inet6/lib
-				ipv6trylibc=yes;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])
-				CFLAGS="-I/usr/inet6/include $CFLAGS"
-			fi
-			;;
-		solaris)
-			# http://www.sun.com
-			AC_EGREP_CPP(yes, [
-#include <netinet/ip6.h>
-#ifdef __sun
-yes
-#endif],
-				[ipv6type=$i;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		toshiba)
-			AC_EGREP_CPP(yes, [
-#include <sys/param.h>
-#ifdef _TOSHIBA_INET6
-yes
-#endif],
-				[ipv6type=$i;
-				ipv6lib=inet6;
-				ipv6libdir=/usr/local/v6/lib;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		v6d)
-			AC_EGREP_CPP(yes, [
-#include </usr/local/v6/include/sys/v6config.h>
-#ifdef __V6D__
-yes
-#endif],
-				[ipv6type=$i;
-				ipv6lib=v6;
-				ipv6libdir=/usr/local/v6/lib;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		zeta)
-			AC_EGREP_CPP(yes, [
-#include <sys/param.h>
-#ifdef _ZETA_MINAMI_INET6
-yes
-#endif],
-				[ipv6type=$i;
-				ipv6lib=inet6;
-				ipv6libdir=/usr/local/v6/lib;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		cygwin)
-			AC_EGREP_CPP(yes, [
-#include <netinet/in.h>
-#ifdef _CYGWIN_IN6_H
-yes
-#endif],
-				[ipv6type=$i;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		TANDEM)
-			AC_EGREP_CPP(yes, [
-#include <netinet/ip6.h>
-#ifdef __TANDEM
-yes
-#endif],
-				[ipv6type=$i;
-				AC_DEFINE(INET6, 1, [true if you have IPv6])])
-			;;
-		esac
-		if test "$ipv6type" != "unknown"; then
-			break
-		fi
-	done
-	AC_MSG_RESULT($ipv6type)
+AS_HELP_STRING([--disable-ipv6],[disable to omit ipv6 support]),
+[ case "$enableval" in
+  no)
+	AC_MSG_RESULT(no)
+	;;
+  *)	AC_MSG_RESULT(yes)
+	AC_DEFINE(INET6, 1, [true if you have IPv6])
+	;;
+  esac ],
 
-	AC_SEARCH_LIBS(getaddrinfo, inet6)
-fi
+  AC_TRY_RUN([ /* AF_INET6 avalable check */
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+main()
+{
+   if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+     exit(1);
+   else
+     exit(0);
+}
+],
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(INET6, 1, [true if you have IPv6]),
+  AC_MSG_RESULT(no),
+  AC_MSG_RESULT(no)
+))
 
 dnl Do you want to disable use of locale functions
 AC_ARG_ENABLE([locale],
-	AS_HELP_STRING([--disable-locale],[disable locale features]))
+	AS_HELP_STRING([--disable-locale],[disable to omit locale features]))
 AH_TEMPLATE([CONFIG_LOCALE],
 [Undefine if you do not want locale features.  By default this is defined.])
 if test x"$enable_locale" != x"no"; then
@@ -519,7 +440,7 @@ esac
 
 AC_MSG_CHECKING([whether to enable use of openssl crypto library])
 AC_ARG_ENABLE([openssl],
-	AS_HELP_STRING([--disable-openssl],[disable openssl crypto library]))
+	AS_HELP_STRING([--disable-openssl],[disable to omit openssl crypto library]))
 AH_TEMPLATE([USE_OPENSSL],
 [Undefine if you do not want to use openssl crypto library.  By default this is defined.])
 if test x"$enable_openssl" != x"no"; then
@@ -540,7 +461,7 @@ fi
 
 AC_MSG_CHECKING([whether to enable xxhash checksum support])
 AC_ARG_ENABLE([xxhash],
-	AS_HELP_STRING([--disable-xxhash],[disable xxhash checksums]))
+	AS_HELP_STRING([--disable-xxhash],[disable to omit xxhash checksums]))
 AH_TEMPLATE([SUPPORT_XXHASH],
 [Undefine if you do not want xxhash checksums.  By default this is defined.])
 if test x"$enable_xxhash" != x"no"; then
@@ -561,7 +482,7 @@ fi
 
 AC_MSG_CHECKING([whether to enable zstd compression])
 AC_ARG_ENABLE([zstd],
-        AC_HELP_STRING([--disable-zstd], [disable zstd compression]))
+        AC_HELP_STRING([--disable-zstd], [disable to omit zstd compression]))
 AH_TEMPLATE([SUPPORT_ZSTD],
 [Undefine if you do not want zstd compression.  By default this is defined.])
 if test x"$enable_zstd" != x"no"; then
@@ -582,7 +503,7 @@ fi
 
 AC_MSG_CHECKING([whether to enable LZ4 compression])
 AC_ARG_ENABLE([lz4],
-        AC_HELP_STRING([--disable-lz4], [disable LZ4 compression]))
+        AC_HELP_STRING([--disable-lz4], [disable to omit LZ4 compression]))
 AH_TEMPLATE([SUPPORT_LZ4],
 [Undefine if you do not want LZ4 compression.  By default this is defined.])
 if test x"$enable_lz4" != x"no"; then
@@ -988,7 +909,7 @@ if test $ac_cv_func_getpgrp = yes; then
 fi
 
 AC_ARG_ENABLE(iconv-open,
-    AS_HELP_STRING([--disable-iconv-open],[disable all use of iconv_open() function]),
+    AS_HELP_STRING([--disable-iconv-open],[disable to avoid all use of iconv_open()]),
     [], [enable_iconv_open=$ac_cv_func_iconv_open])
 
 if test x"$enable_iconv_open" != x"no"; then
@@ -996,7 +917,7 @@ if test x"$enable_iconv_open" != x"no"; then
 fi
 
 AC_ARG_ENABLE(iconv,
-    AS_HELP_STRING([--disable-iconv],[disable rsync's --iconv option]),
+    AS_HELP_STRING([--disable-iconv],[disable to omit the --iconv option]),
     [], [enable_iconv=$enable_iconv_open])
 AH_TEMPLATE([ICONV_OPTION],
 [Define if you want the --iconv option.  Specifying a value will set the
@@ -1333,7 +1254,7 @@ AC_CHECK_FUNCS(_acl __acl _facl __facl)
 
 AC_MSG_CHECKING([whether to support ACLs])
 AC_ARG_ENABLE(acl-support,
-	AS_HELP_STRING([--disable-acl-support],[disable ACL support]))
+	AS_HELP_STRING([--disable-acl-support],[disable to omit ACL support]))
 
 if test x"$enable_acl_support" = x"no"; then
     AC_MSG_RESULT(no)
@@ -1417,7 +1338,7 @@ fi
 # check for extended attribute support
 AC_MSG_CHECKING(whether to support extended attributes)
 AC_ARG_ENABLE(xattr-support,
-    AS_HELP_STRING([--disable-xattr-support],[disable extended attributes]),
+    AS_HELP_STRING([--disable-xattr-support],[disable to omit extended attributes]),
     [], [case "$ac_cv_func_getxattr$ac_cv_func_extattr_get_link$ac_cv_func_attropen" in
 	*yes*) enable_xattr_support=maybe ;;
 	*) enable_xattr_support=no ;;
diff --git a/receiver.c b/receiver.c
index e85c4779..b5020d07 100644
--- a/receiver.c
+++ b/receiver.c
@@ -881,7 +881,7 @@ int recv_files(int f_in, int f_out, char *local_name)
 					do_unlink(partialptr);
 				handle_partial_dir(partialptr, PDIR_DELETE);
 			}
-		} else if (keep_partial && partialptr && !one_inplace) {
+		} else if (keep_partial && partialptr && (!one_inplace || delay_updates)) {
 			if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
 				rprintf(FERROR,
 					"Unable to create partial-dir for %s -- discarding %s.\n",
diff --git a/rsync-ssl b/rsync-ssl
index 46701af1..56ee7dfe 100755
--- a/rsync-ssl
+++ b/rsync-ssl
@@ -73,8 +73,16 @@ function rsync_ssl_helper {
 	certopt=""
 	gnutls_cert_opt=""
     else
-	certopt="cert$optsep$RSYNC_SSL_CERT"
-	gnutls_cert_opt="--x509keyfile=$RSYNC_SSL_CERT"
+	certopt="-cert$optsep$RSYNC_SSL_CERT"
+	gnutls_cert_opt="--x509certfile=$RSYNC_SSL_CERT"
+    fi
+
+    if [[ -z "$RSYNC_SSL_KEY" ]]; then
+	keyopt=""
+	gnutls_key_opt=""
+    else
+	keyopt="-key$optsep$RSYNC_SSL_KEY"
+	gnutls_key_opt="--x509keyfile=$RSYNC_SSL_KEY"
     fi
 
     if [[ -z ${RSYNC_SSL_CA_CERT+x} ]]; then
@@ -129,9 +137,9 @@ function rsync_ssl_helper {
     fi
 
     if [[ $RSYNC_SSL_TYPE == openssl ]]; then
-	exec $RSYNC_SSL_OPENSSL s_client $caopt $certopt -quiet -verify_quiet -servername $hostname -verify_hostname $hostname -connect $hostname:$port


-- 
The rsync repository.



More information about the rsync-cvs mailing list