aboutsummaryrefslogtreecommitdiffstats
path: root/main/rsync
diff options
context:
space:
mode:
Diffstat (limited to 'main/rsync')
-rw-r--r--main/rsync/APKBUILD4
-rw-r--r--main/rsync/Fix-regression-with---delay-updates.patch26
2 files changed, 29 insertions, 1 deletions
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 10a7a8dc1a..5529cd1199 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=rsync
pkgver=3.2.3
-pkgrel=3
+pkgrel=4
pkgdesc="A file transfer program to keep remote files in sync"
url="https://rsync.samba.org/"
arch="all"
@@ -9,6 +9,7 @@ license="GPL-3.0-or-later"
makedepends="perl acl-dev attr-dev popt-dev zlib-dev zstd-dev"
subpackages="$pkgname-doc $pkgname-openrc rrsync"
source="https://download.samba.org/pub/rsync/rsync-$pkgver.tar.gz
+ Fix-regression-with---delay-updates.patch
rsyncd.initd
rsyncd.confd
rsyncd.conf
@@ -79,6 +80,7 @@ rrsync() {
sha512sums="
48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e rsync-3.2.3.tar.gz
+01a8560419e536c4987a6954b51d0751bce77e041f2d75157067156c0e197178e25e7a6b0ca29cca5d4474f5671ac36500079dba1ed1737cea18f1d663570321 Fix-regression-with---delay-updates.patch
b9bf1aa02f96e4294642ead5751bd529ca1267c08e83a16342fba5736c3a8ec89568feb11fb737e974cb1bee7e00e7a8898d25844892366c6167b9ea8d1e647c rsyncd.initd
d91337cfb57e6e3b2a8ba1e24f7d851dd927bfc327da2212b9eb0acda0e1ca2f24987f6dcc4903eccc3bf170e0f115172b3cfa5a172700495296f26302c834d7 rsyncd.confd
3db8a2b364fc89132af6143af90513deb6be3a78c8180d47c969e33cb5edde9db88aad27758a6911f93781e3c9846aeadc80fffc761c355d6a28358853156b62 rsyncd.conf
diff --git a/main/rsync/Fix-regression-with---delay-updates.patch b/main/rsync/Fix-regression-with---delay-updates.patch
new file mode 100644
index 0000000000..d914d14dec
--- /dev/null
+++ b/main/rsync/Fix-regression-with---delay-updates.patch
@@ -0,0 +1,26 @@
+From 5a4ea7e468ae53c09b98803da3519727becb48ad Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 22 Jul 2021 13:30:17 +0200
+Subject: [PATCH] Fix regression with --delay-updates (#192)
+
+Fixes regression introduced with commit 3a7bf54ad520 (A resumed
+partial-dir file is transferred in-place.)
+
+Fixes https://github.com/WayneD/rsync/issues/192
+---
+ receiver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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",