Merge rsync from Debian unstable for kinetic

Bug #1971319 reported by Bryce Harrington
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
rsync (Ubuntu)
Fix Released
Undecided
Sergio Durigan Junior

Bug Description

Upstream: tbd
Debian: 3.2.4-1
Ubuntu: 3.2.3-8ubuntu3

Debian does new releases regularly, so it's likely there will be newer versions available before FF that we can pick up if this merge is done later in the cycle.

### New Debian Changes ###

rsync (3.2.4-1) unstable; urgency=medium

  [ Samuel Henrique ]
  * New upstream version 3.2.4
    - Work around a glibc bug where lchmod() breaks in a chroot w/o /proc
      mounted (closes: #995046).
    - rsync.1: remove prepended backticks which broke --stop-after and
      --stop-at formatting (closes: #1007990).
  * Ship new python-based rrsync with --with-rrsync:
    - rrsync was previouysly written in bash.
    - A manpage is now shipped for rrsync.
    - python3 and python3-cmarkgfm are new B-Ds since they're needed
      to generate the manpage.
  * d/control:
    - Add version requirement for some libxxhash-dev and libzstd-dev as
      per upstream docs.
    - Add python3-braceexpand to Suggests as it can be used by rrsync.
  * d/rsync.install: cull_options has been renamed to cull-options.
  * d/patches:
    - Refresh the following patches:
      ~ disable_reconfigure_req.diff;
      ~ perl_shebang.patch;
      ~ skip_devices_test.patch;
    - Drop the following patches, applied upstream now:
      ~ CVE-2020-14387.patch;
      ~ copy-devices.diff;
      ~ fix_delay_updates.patch;
      ~ fix_ftcbfs_configure.patch;
      ~ fix_mkpath.patch;
      ~ fix_rsync-ssl_RSYNC_SSL_CERT_feature.patch;
      ~ fix_sparse_inplace.patch;
      ~ manpage_upstream_fixes.patch;
      ~ update_rrsync_options.patch;
      ~ workaround_glibc_lchmod_regression.patch;

  [ Sergio Durigan Junior ]
  * d/rules: Disable ASM optimizations when building.
    This is not needed because the only ASM-optimized implementation
    available is the MD5 hash, which is actually a no-op because we link
    against OpenSSL and rsync ends up using that library's implementation
    of the hash. Even then, the final binary ends up with the
    ASM-optimized version included, which makes it become
    CET-incompatible.
    Thanks to Dimitri John Ledkov <email address hidden>

 -- Samuel Henrique <email address hidden> Mon, 18 Apr 2022 14:44:44 +0100

rsync (3.2.3-8) unstable; urgency=medium

  * debian/patches:
    - manpage_upstream_fixes.patch: Import multiple upstream patches to fix
      manpage.
    - copy-devices.diff: Add missing manpage changes to patch
    - CVE-2020-14387.patch: Add Forwarded DEP3 field to point to upstream patch
    - fix_delay_updates.patch: Refresh patch
    - fix_mkpath.patch: New upstream patch to fix an edge case on --mkpath
    - fix_rsync-ssl_RSYNC_SSL_CERT_feature.patch: New upstream patch
    - fix_sparse_inplace.patch: New upstream patch to fix --sparse + --inplace
      options
    - update_rrsync_options.patch: New upstream patch to update rrsync options

 -- Samuel Henrique <email address hidden> Sat, 25 Sep 2021 17:38:16 +0100

rsync (3.2.3-7) unstable; urgency=medium

  * Bump Standards-Version to 4.6.0
  * d/p/workaround_glibc_lchmod_regression.patch: New patch from upstream
    (closes: #994543)
  * debian/rsync.NEWS: Fix typo in last entry

 -- Samuel Henrique <email address hidden> Sat, 18 Sep 2021 00:25:13 +0100

rsync (3.2.3-6) unstable; urgency=medium

  * d/t/upstream-tests: Suppress stderr warnings from the build process

 -- Samuel Henrique <email address hidden> Sun, 12 Sep 2021 18:22:57 +0100

rsync (3.2.3-5) unstable; urgency=medium

  [ 刘建强 ]
  * Set the rsync.service not to start automatically after installation,
    the rsyncd.conf configuration file needs to be configured by the user
    before the service can start

  [ Samuel Henrique ]
  * Re-add upstream patch for --copy-devices, the --write-devices option is
    not fully equivalent (closes: #992215)
  * d/rsync.docs: Add NEWS.md file (previously named NEWS) (closes: #993697)
  * d/p/fix_delay_updates.patch: New patch from upstream (closes: #992231)

 -- Samuel Henrique <email address hidden> Sun, 12 Sep 2021 17:25:37 +0100

rsync (3.2.3-4) unstable; urgency=medium

  [ Helmut Grohne ]
  * d/p/fix_ftcbfs_configure.patch: New patch to fix FTCBFS (closes: #971285)

  [ Samuel Henrique ]
  * Bump Standards-Version to 4.5.1

### Old Ubuntu Delta ###

rsync (3.2.3-8ubuntu3) jammy; urgency=high

  * No change rebuild for ppc64el baseline bump.

 -- Julian Andres Klode <email address hidden> Fri, 25 Mar 2022 10:51:06 +0100

rsync (3.2.3-8ubuntu2) jammy; urgency=medium

  * No-change rebuild against openssl3

 -- Simon Chopin <email address hidden> Wed, 24 Nov 2021 14:01:07 +0000

rsync (3.2.3-8ubuntu1) jammy; urgency=medium

  * Merge with Debian unstable. Remaining changes:
    - debian/rules: add --disable-asm configure flag. The only asm
      implementation is available for md5 on x86_64, however it is no-op,
      because we built with OpenSSL which has optimized md5
      implementation. Furthermore, linking noop md5 asm on x86_64 results in
      rsync binary not getting marked as CET compatible, because the noop
      md5 asm is not marked as CET compatible. Thus building without noop
      md5 asm, results in rsync gaining CET.

 -- Bryce Harrington <email address hidden> Mon, 01 Nov 2021 16:05:43 -0700

CVE References

Bryce Harrington (bryce)
Changed in rsync (Ubuntu):
milestone: none → ubuntu-22.07
Changed in rsync (Ubuntu):
assignee: nobody → Sergio Durigan Junior (sergiodj)
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

The Delta we have is up since Groovy (added by xnox), sadly without any bug reference test details or anything else. Since then we have had H,I,J merges just retaining it as-is.

Gladly the last merger (Thanks Sergio) picked this up for real :-)
Therefore we now have [1] including the later refinement of [2] which does not contradict.

Thereby 3.2.4-1 contains all our remaining Delta and various upstream and packaging improvements.
This is ready to be a sync.

[1]: https://salsa.debian.org/debian/rsync/-/commit/8dfd09fe5c850564953825c81d2f523fa0f30f07
[2]: https://salsa.debian.org/debian/rsync/-/commit/34390672fadd347f157148deb3b66cbf27ae6ed1

tags: added: needs-sync
removed: needs-merge
Changed in rsync (Ubuntu):
assignee: Sergio Durigan Junior (sergiodj) → Christian Ehrhardt  (paelzer)
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Test build in PPA: https://launchpad.net/~paelzer/+archive/ubuntu/kinetic-rsync
Once built I'll also run the autopkgtests there ...

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Builds on amd64 are fine.

So one could think "heeey sync \o/", but sadly i386 crosses that plan :-/
i386 has:
Missing build dependencies: python3-cmarkgfm

Those are needed to generate manpages :-/
So it can't be a sync yet :-/

I guess one needs to check how much of a dependency chain that would need to bring into i386 that isn't there.
Sadly the removal of i386 rsync seems unlikely, the list of `$ reverse-depends --release=kinetic src:rsync --arch=i386` is rather long.

I hope this 30 minute pre-check helps to save some time when getting to it, it can't be handled as fast as I hoped :-/
Yielding back to Sergio

Changed in rsync (Ubuntu):
assignee: Christian Ehrhardt  (paelzer) → Sergio Durigan Junior (sergiodj)
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

This bug was fixed in the package rsync - 3.2.4-1

---------------
rsync (3.2.4-1) unstable; urgency=medium

  [ Samuel Henrique ]
  * New upstream version 3.2.4
    - Work around a glibc bug where lchmod() breaks in a chroot w/o /proc
      mounted (closes: #995046).
    - rsync.1: remove prepended backticks which broke --stop-after and
      --stop-at formatting (closes: #1007990).
  * Ship new python-based rrsync with --with-rrsync:
    - rrsync was previouysly written in bash.
    - A manpage is now shipped for rrsync.
    - python3 and python3-cmarkgfm are new B-Ds since they're needed
      to generate the manpage.
  * d/control:
    - Add version requirement for some libxxhash-dev and libzstd-dev as
      per upstream docs.
    - Add python3-braceexpand to Suggests as it can be used by rrsync.
  * d/rsync.install: cull_options has been renamed to cull-options.
  * d/patches:
    - Refresh the following patches:
      ~ disable_reconfigure_req.diff;
      ~ perl_shebang.patch;
      ~ skip_devices_test.patch;
    - Drop the following patches, applied upstream now:
      ~ CVE-2020-14387.patch;
      ~ copy-devices.diff;
      ~ fix_delay_updates.patch;
      ~ fix_ftcbfs_configure.patch;
      ~ fix_mkpath.patch;
      ~ fix_rsync-ssl_RSYNC_SSL_CERT_feature.patch;
      ~ fix_sparse_inplace.patch;
      ~ manpage_upstream_fixes.patch;
      ~ update_rrsync_options.patch;
      ~ workaround_glibc_lchmod_regression.patch;

  [ Sergio Durigan Junior ]
  * d/rules: Disable ASM optimizations when building.
    This is not needed because the only ASM-optimized implementation
    available is the MD5 hash, which is actually a no-op because we link
    against OpenSSL and rsync ends up using that library's implementation
    of the hash. Even then, the final binary ends up with the
    ASM-optimized version included, which makes it become
    CET-incompatible.
    Thanks to Dimitri John Ledkov <email address hidden>

 -- Samuel Henrique <email address hidden> Mon, 18 Apr 2022 14:44:44 +0100

Changed in rsync (Ubuntu):
status: New → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.