[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Sun Jul 12 19:39:12 UTC 2020
The branch, master has been updated
via d495e343 A few word tweaks.
via de7e4d00 Improve FreeBSD tests (#61)
via 374cc1be Get my yaml continuation line right.
from 8b25488f More CI tweaks
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d495e343c0671de620193987ae9de3f02a611b4a
Author: Wayne Davison <wayne at opencoder.net>
Date: Sun Jul 12 12:38:12 2020 -0700
A few word tweaks.
commit de7e4d00ab899550017318e1077d4c33ce57f931
Author: Ben RUBSON <6764151+benrubson at users.noreply.github.com>
Date: Sun Jul 12 21:36:02 2020 +0200
Improve FreeBSD tests (#61)
Improve FreeBSD tests & use a ZFS mount for the CI's testtmp.
commit 374cc1be74834ff9cc380a0427401007b9d62eb3
Author: Wayne Davison <wayne at opencoder.net>
Date: Sat Jul 11 16:13:06 2020 -0700
Get my yaml continuation line right.
-----------------------------------------------------------------------
Summary of changes:
.cirrus.yml | 2 ++
.github/workflows/ccpp.yml | 4 ++--
NEWS.md | 10 +++++-----
loadparm.c | 2 +-
runtests.sh | 2 +-
testsuite/chown.test | 7 +++++++
testsuite/devices.test | 14 ++++++++++++++
testsuite/xattrs.test | 13 +++++++++++++
8 files changed, 45 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.cirrus.yml b/.cirrus.yml
index a8acc382..9d5f5a35 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,6 +3,8 @@ task:
freebsd_instance:
image: freebsd-12-1-release-amd64
prep_script:
+ - dd if=/dev/zero of=/tmp/zpool bs=1M count=1024
+ - zpool create -m `pwd`/testtmp zpool /tmp/zpool
- pkg install -y autotools xxhash zstd liblz4 openssl bash
- ln -s /usr/local/bin/bash /bin/bash
configure_script:
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 610a3dd4..1cfceeab 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -14,8 +14,8 @@ jobs:
steps:
- uses: actions/checkout at v2
- name: prepare-packages
- run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev liblz4-dev libzstd-dev \
- libxxhash-dev python3-cmarkgfm openssl
+ run: sudo apt-get install fakeroot acl libacl1-dev attr libattr1-dev
+ liblz4-dev libzstd-dev libxxhash-dev python3-cmarkgfm openssl
- name: prepare-source
run: ./prepare-source
- name: configure
diff --git a/NEWS.md b/NEWS.md
index 9d6a2459..9bd98bae 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -15,11 +15,11 @@
- Allow `--max-alloc=0` to specify unlimited.
- - Allow `--block-size=SIZE` to specify the size using a suffix such as "K".
+ - Allow `--block-size=SIZE` to specify the size using units such as "100K".
- The name of the id 0 user & group is now sent to the receiver along with the
- other uer/group names in the transfer instead of assuming that both sides
- have the same id-0 names.
+ other user/group names in the transfer (instead of assuming that both sides
+ have the same id-0 names).
- Added some compatibility code for HPE NonStop platforms.
@@ -327,7 +327,7 @@
### PACKAGING RELATED:
- - Add installed binary: /usr/bin/rsync-ssl
+ - Add installed bash script: /usr/bin/rsync-ssl
- Add installed man page: /usr/man/man1/rsync-ssl.1
@@ -367,7 +367,7 @@
- Converted the man pages from yodl to markdown. They are now processed via a
simple python3 script using the cmarkgfm **or** commonmark library. This
- should make it easier to package rsync, since yodl has gotten obscure.
+ should make it easier to package rsync, since yodl is rather obscure.
- Improved some configure checks to work better with strict C99 compilers.
diff --git a/loadparm.c b/loadparm.c
index a1d5992d..952a0b74 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -242,7 +242,7 @@ static char *expand_vars(const char *str)
* typedef local_vars - describes a single section.
* typedef all_vars - a combination of global_vars & local_vars.
* all_vars Defaults - the default values for all the variables.
- * all_vars Vars - tThe currently configured values for all the variables.
+ * all_vars Vars - the currently configured values for all the variables.
* struct parm_struct parm_table - the strings & variables for the parser.
* FN_{LOCAL,GLOBAL}_{TYPE}() definition for all the lp_var_name() accessors.
*/
diff --git a/runtests.sh b/runtests.sh
index 536543f8..d5a174cb 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -249,7 +249,7 @@ prep_scratch() {
[ -d "$scratchdir" ] && chmod -R u+rwX "$scratchdir" && rm -rf "$scratchdir"
mkdir "$scratchdir"
# Get rid of default ACLs and dir-setgid to avoid confusing some tests.
- $setfacl_nodef "$scratchdir" || true
+ $setfacl_nodef "$scratchdir" 2>/dev/null || true
chmod g-s "$scratchdir"
case "$srcdir" in
/*) ln -s "$srcdir" "$scratchdir/src" ;;
diff --git a/testsuite/chown.test b/testsuite/chown.test
index 1464c65a..3aec55a9 100644
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -37,6 +37,13 @@ EOF
done
}
;;
+ freebsd*)
+ chown() {
+ own=$1
+ shift
+ setextattr -h user "rsync.%stat" "100644 0,0 $own" "${@}"
+ }
+ ;;
*)
chown() {
own=$1
diff --git a/testsuite/devices.test b/testsuite/devices.test
index 908898c2..773c543f 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -50,6 +50,20 @@ echo "$mode $maj,$min 0:0" > rsync.%stat
EOF
}
;;
+ freebsd*)
+ mknod() {
+ fn="$1"
+ case "$2" in
+ p) mode=10644 ;;
+ c) mode=20644 ;;
+ b) mode=60644 ;;
+ esac
+ maj="${3:-0}"
+ min="${4:-0}"
+ touch "$fn"
+ setextattr -h user "rsync.%stat" "$mode $maj,$min 0:0" "$fn"
+ }
+ ;;
*)
mknod() {
fn="$1"
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index 5931ffcd..59fe1601 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -45,6 +45,19 @@ EOF
RSYNC_PREFIX='rsync'
RUSR='rsync.nonuser'
;;
+freebsd*)
+ xset() {
+ xnam="$1"
+ xval="$2"
+ shift 2
+ setextattr -h user "$xnam" "$xval" "${@}"
+ }
+ xls() {
+ for f in "${@}"; do lsextattr -q -h user "$f" | tr '[[:space:]]' '\n' | sort | xargs -I % getextattr -h user % "$f"; done
+ }
+ RSYNC_PREFIX='rsync'
+ RUSR='rsync'
+ ;;
*)
xset() {
xnam="$1"
--
The rsync repository.
More information about the rsync-cvs
mailing list