From 5858d57a04bc054d88437352e2007d10c432eb09 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Tue, 21 Jun 2022 16:11:53 +0200
Subject: [PATCH 1/3] rsync: Increment build number

---
 rsync.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rsync.be0 b/rsync.be0
index e83e79fba..fa699cd72 100755
--- a/rsync.be0
+++ b/rsync.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION rsync-3.2.4-1
+# BEE_VERSION rsync-3.2.4-2
 
 # more info: https://rsync.samba.org , https://launchpad.net/debian/+source/rsync/
 

From 2bd9bec227c799ecae086f73a0736d7695e2c06e Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Tue, 21 Jun 2022 16:12:13 +0200
Subject: [PATCH 2/3] rsync: Remove stray variable reference

This works by accident if $p evaluates to an empty string which is no
longer the case when we add a PATCHURL.
---
 rsync.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rsync.be0 b/rsync.be0
index fa699cd72..9041000e6 100755
--- a/rsync.be0
+++ b/rsync.be0
@@ -23,7 +23,7 @@ BEE_BUILDTYPE=autotools
 #}
 
 mee_patch_pre() {
-  for p in $( cat $S/debian/patches/$p/series ); do
+  for p in $( cat $S/debian/patches/series ); do
     echo "adding patch $p"
     bee_PATCHFILES+=( $S/debian/patches/$p )
   done

From 969d73e037822b9ee6f146b3ba4098ab242a8d07 Mon Sep 17 00:00:00 2001
From: Donald Buczek <buczek@molgen.mpg.de>
Date: Tue, 21 Jun 2022 16:14:01 +0200
Subject: [PATCH 3/3] rsync: Add patch to exit on hard link failure

Rsync might crash if we continue after a hard link failure. There is no
reasonable way anyway, so just abort with recognizable error code.

https://github.com/WayneD/rsync/issues/329
---
 hlink.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hlink.c b/hlink.c
index 66810a3e..23869872 100644
--- a/hlink.c
+++ b/hlink.c
@@ -464,7 +464,10 @@ int hard_link_one(struct file_struct *file, const char *fname,
 			code = FERROR_XFER;
 		rsyserr(code, errno, "link %s => %s failed",
 			full_fname(fname), oldname);
-		return 0;
+
+		/* This is broken beyond repair for --link-dest. No good way to continue here. */
+		fprintf(stderr, "Aborting due to hard link failure\n");
+		_exit(33);
 	}

 	file->flags |= FLAG_HLINK_DONE;
--
2.36.0
---
 rsync.be0 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rsync.be0 b/rsync.be0
index 9041000e6..4b3be450d 100755
--- a/rsync.be0
+++ b/rsync.be0
@@ -12,6 +12,9 @@ SRCURL[0]="https://beehive.molgen.mpg.de/26f1c64259fbd2ed7a59b28d2787ecf2/rsync-
 # SRCURL[1]="https://launchpad.net/debian/+archive/primary/+sourcefiles/rsync/3.2.4-1/rsync_3.2.4-1.debian.tar.xz"
 SRCURL[1]="https://beehive.molgen.mpg.de/54f987de1f929d0411bbb815c248f28d/rsync_3.2.4-1.debian.tar.xz"
 
+# PATCHURL+=(/src/mariux/patches/rsync-abort-on-hard-link-failure.patch)
+PATCHURL+=("https://beehive.molgen.mpg.de/2d9d0053167d4d6e202357edda0a4a4d/rsync-abort-on-hard-link-failure.patch")
+
 BEE_BUILDTYPE=autotools
 
 # build_in_sourcedir