The branch, master has been updated
       via  dff9dd56 Remove xxhash from capabilities list.
       via  7182508a Fix a couple deb names.
       via  cb0fe9e1 Improve CI setup.
      from  87f2984d Improve how negotiated info affects batch files.

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


- Log -----------------------------------------------------------------
commit dff9dd56a0935a1670322f7f95615cafd0db3197
Author: Wayne Davison <wa...@opencoder.net>
Date:   Mon May 25 21:27:21 2020 -0700

    Remove xxhash from capabilities list.
    
    It's now listed in the "Checksum list:" output.

commit 7182508a752ad5457f75eb2a7f767123c1c65a89
Author: Wayne Davison <wa...@opencoder.net>
Date:   Mon May 25 21:21:58 2020 -0700

    Fix a couple deb names.

commit cb0fe9e1950b9e4252a7cdcd72bb9fcd705cf30f
Author: Wayne Davison <wa...@opencoder.net>
Date:   Mon May 25 21:17:51 2020 -0700

    Improve CI setup.

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

Summary of changes:
 .github/workflows/ccpp.yml | 4 ++++
 options.c                  | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 15772993..6bc75b48 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -13,11 +13,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: prepare-packages
+      run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev 
liblz4-dev
     - name: prepare-source
       run: ./prepare-source
     - name: configure
       run: ./configure --with-included-popt --with-protected-args 
--with-included-zlib --enable-simd
     - name: make
       run: make
+    - name: version-summary
+      run: ./rsync --version
     - name: make check
       run: make check
diff --git a/options.c b/options.c
index 07511b05..9f5a24d6 100644
--- a/options.c
+++ b/options.c
@@ -581,7 +581,6 @@ static void print_rsync_version(enum logcode f)
        char const *iconv = "no ";
        char const *ipv6 = "no ";
        char const *simd = "no ";
-       char const *xxhash = "no ";
        STRUCT_STAT *dumstat;
 
 #if SUBPROTOCOL_VERSION != 0
@@ -621,9 +620,6 @@ static void print_rsync_version(enum logcode f)
 #ifdef HAVE_SIMD
        simd = "";
 #endif
-#ifdef SUPPORT_XXHASH
-       xxhash = "";
-#endif
 
        rprintf(f, "%s  version %s  protocol version %d%s\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
@@ -637,8 +633,8 @@ static void print_rsync_version(enum logcode f)
                (int)(sizeof (int64) * 8));
        rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, 
batchfiles, %sinplace,\n",
                got_socketpair, hardlinks, links, ipv6, have_inplace);
-       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, 
%sprealloc, %sSIMD, %sxxhash\n",
-               have_inplace, acls, xattrs, iconv, symtimes, prealloc, simd, 
xxhash);
+       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, 
%sprealloc, %sSIMD\n",
+               have_inplace, acls, xattrs, iconv, symtimes, prealloc, simd);
 
        rprintf(f,"\n");
        


-- 
The rsync repository.

_______________________________________________
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs

Reply via email to