Merging debian version 3.3.0-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 27 deletions

diff --git a/debian/patches/skip_devices_test.patch b/debian/patches/skip_devices_test.patch
index 5cb4644..8e40d7e 100644
--- a/debian/patches/skip_devices_test.patch
+++ b/debian/patches/skip_devices_test.patch
@@ -1,27 +1,8 @@
-Author: Samuel Henrique <samueloph@debian.org>
-Description: Skip "devices" test as it fails on kfreebsd and hurd
- Error log:
- /----- devices log follows
- Testing for symlinks using 'test -h'
- Let's try re-running the script under fakeroot...
- Testing for symlinks using 'test -h'
- cD+++++++++ block
- cD+++++++++ block2
- default_perms_for_dir: sys_acl_get_file(., ACL_TYPE_DEFAULT): Operation not supported, falling back on umask
- cDc.T...... block3
- sending incremental file list
- delta-transmission disabled for local transfer or --whole-file
- .d..t...... ./
- cDc.t...... block
- cDc........ block2
- cD+++++++++ block3
- hD+++++++++ block3.5 => block3
- cD+++++++++ char
- cD+++++++++ char2
- cD+++++++++ char3
- cS+++++++++ fifo
- total: matches=0  hash_hits=0  false_alarms=0 data=0
+From: Samuel Henrique <samueloph@debian.org>
+Date: Fri, 12 Apr 2024 00:11:07 +0100
+Subject: Skip "devices" test as it fails on kfreebsd and hurd
 
+Error log:
  sent 160 bytes  received 117 bytes  554.00 bytes/sec
  total size is 0  speedup is 0.00
  check how the directory listings compare with diff:
@@ -57,10 +38,14 @@ Description: Skip "devices" test as it fails on kfreebsd and hurd
  /bin/settrans: Error 1 for child 7540
  ----- devices log ends
  FAIL    devices
-Index: rsync/testsuite/devices.test
-===================================================================
---- rsync.orig/testsuite/devices.test
-+++ rsync/testsuite/devices.test
+---
+ testsuite/devices.test | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/testsuite/devices.test b/testsuite/devices.test
+index ad5f936..9deec07 100644
+--- a/testsuite/devices.test
++++ b/testsuite/devices.test
 @@ -9,6 +9,9 @@
  
  . "$suitedir/rsync.fns"