Merge ~sergiodj/ubuntu/+source/rsync:rsync-merge-3.2.3-1 into ubuntu/+source/rsync:debian/sid

[Sergio Durigan Junior]

This is the merge of rsync 3.2.3-1 from Debian.

Christian did a merge of rsync last week (https://code.launchpad.net/~paelzer/ubuntu/+source/rsync/+git/rsync/+merge/388554), so maybe he'd like to take a look at this MP.

This merge is pretty straightforward; Debian just sync'ed/removed a few local patches, and released a new minor upstream version. This release still doesn't carry the patch I submitted to Debian in order to zero our delta and make the package a sync, therefore we still have to carry our modifications. The patch has been accepted by Debian recently, so next time rsync will become a sync.

There are no other noteworthy changes, and no Ubuntu bugs that can be fixed by this merge.

autopkgtest is still happy:

autopkgtest [18:49:46]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-tests PASS

[Christian Ehrhardt  (paelzer)]

Yeah - still looks like I've seen it last time.
Thanks for the update on the acceptance of our Delta.

+1 on the merge for groovy as presented.

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Tuesday, August 11 2020, Christian Ehrhardt  wrote:

> Yeah - still looks like I've seen it last time.
> Thanks for the update on the acceptance of our Delta.
>
> +1 on the merge for groovy as presented.

Thanks, Christian :-).

I'll need a sponsorship on this, please :-).

Thanks,

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/ubuntu/+source/rsync
 * [new tag] upload/3.2.3-1ubuntu1 -> upload/3.2.3-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading rsync_3.2.3-1ubuntu1.dsc: done.
  Uploading rsync_3.2.3.orig.tar.gz: done.
  Uploading rsync_3.2.3.orig.tar.gz.asc: done.
  Uploading rsync_3.2.3-1ubuntu1.debian.tar.xz: done.
  Uploading rsync_3.2.3-1ubuntu1_source.buildinfo: done.
  Uploading rsync_3.2.3-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Lucas Kanashiro (lucaskanashiro)]

This has migrated.

diff --git a/debian/changelog b/debian/changelog
index df44319..f0059e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rsync (3.2.3-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/t/control, d/t/upstream-tests: Make autopkgtests cross-test-friendly
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 10 Aug 2020 17:32:07 -0400
+
 rsync (3.2.3-1) unstable; urgency=medium
 
   * New upstream version 3.2.3
@@ -9,6 +16,13 @@ rsync (3.2.3-1) unstable; urgency=medium
 
  -- Samuel Henrique <[e-mail]>  Sun, 09 Aug 2020 13:41:10 +0100
 
+rsync (3.2.2-2ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1888685). Remaining changes:
+    - d/t/control, d/t/upstream-tests: Make autopkgtests cross-test-friendly
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 03 Aug 2020 11:22:30 +0200
+
 rsync (3.2.2-2) unstable; urgency=medium
 
   * d/p/fix_bwlimit_0.patch: New upstream patch to fix bwlimit=0
@@ -23,6 +37,21 @@ rsync (3.2.2-1) unstable; urgency=medium
 
  -- Samuel Henrique <[e-mail]>  Mon, 06 Jul 2020 19:01:52 +0100
 
+rsync (3.2.1-1ubuntu2) groovy; urgency=medium
+
+  * d/t/upstream-tests: Don't quote $CROSS_COMPILE when invoking
+    configure.sh.  When we do it, the script will mistakenly generate
+    a warning to stderr saying that "you should use --build, --host,
+    --target", which will make the test fail. (LP: #1887572)
+
+ -- Sergio Durigan Junior <[e-mail]>  Tue, 14 Jul 2020 15:34:24 -0400
+
+rsync (3.2.1-1ubuntu1) groovy; urgency=medium
+
+  * Make autopkgtests cross-test-friendly.
+
+ -- Steve Langasek <[e-mail]>  Thu, 02 Jul 2020 09:05:32 -0700
+
 rsync (3.2.1-1) unstable; urgency=medium
 
   * New upstream version 3.2.1
diff --git a/debian/control b/debian/control
index d2c5dca..0b4ce56 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: rsync
 Section: net
 Priority: optional
-Maintainer: Paul Slootman <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Paul Slootman <[e-mail]>
 Uploaders: Samuel Henrique <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                libacl1-dev,
diff --git a/debian/tests/control b/debian/tests/control
index d3afc12..5a8f97d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: upstream-tests
-Depends: @, @builddeps@
+Depends: @, @builddeps@, build-essential
diff --git a/debian/tests/upstream-tests b/debian/tests/upstream-tests
index 89e6082..7b9911c 100644
--- a/debian/tests/upstream-tests
+++ b/debian/tests/upstream-tests
@@ -1,9 +1,16 @@
 #!/bin/sh
 set -e
 
+if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then
+  CROSS_COMPILE="--host=$DEB_HOST_GNU_TYPE"
+else
+  CROSS_COMPILE=
+fi
+
+
 # Create needed files for tests
 ./prepare-source build
-./configure.sh
+./configure.sh $CROSS_COMPILE
 
 # Supress gcc warnings (autopkg treats them as failures)
 make tls getgroups getfsdev trimslash t_unsafe wildtest testrun 2>/dev/null