Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rdiff-backup and librsync #3916

Closed

Conversation

fastcat
Copy link
Contributor

@fastcat fastcat commented Mar 9, 2020

Motivation: Update rdiff-backup and underlying librsync library to be compatible with the versions shipped with Debian Bullseye (currently testing), and generally to be up to date with upstream.
Linked issues:

Checklist

  • Build rule all-supported completed successfully
    • for rdiff-backup
    • for duplicity (other user of librsync)
  • Package upgrade completed successfully
  • New installation of package completed successfully

Note: this is a work in progress that I'm still testing. I'm unsure how to safely complete the "new install" checklist item without putting my NAS that holds my real backups at risk

Similarly I may need help testing that duplicity isn't broken beyond making sure it builds. Debian is building it against librsync 2.0.1, so I expect it should be OK, though it too may need an update to a newer upstream version.

@fastcat fastcat force-pushed the fix/rdiff-backup-deb-patches branch 2 times, most recently from 59b2efc to ff24b5e Compare March 10, 2020 03:44
@fastcat fastcat marked this pull request as ready for review March 10, 2020 13:59
Copy link
Contributor

@ymartin59 ymartin59 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contribution. Great job.
Some minor improvements are requested. Please also renumber patches so that ordering is properly enforced (at list renumber cross/rdiff-backup/patches/04_librsync2.patch)

cross/librsync/Makefile Outdated Show resolved Hide resolved
cross/rdiff-backup/Makefile Outdated Show resolved Hide resolved
@fastcat fastcat requested a review from ymartin59 March 10, 2020 21:14
cross/librsync/Makefile Outdated Show resolved Hide resolved
cross/popt/Makefile Outdated Show resolved Hide resolved
@fastcat
Copy link
Contributor Author

fastcat commented Mar 11, 2020

rewriting history to address last review item...

@fastcat fastcat force-pushed the fix/rdiff-backup-deb-patches branch from cceef23 to ad3e102 Compare March 11, 2020 00:38
@fastcat fastcat requested a review from hgy59 March 11, 2020 00:38
@fastcat
Copy link
Contributor Author

fastcat commented Mar 16, 2020

Now that master is fixed w.r.t. building python 2.7 packages, I've rebased this up to that and smoke tested that it indeed still builds -- I just checked the denverton arch for my NAS, but happy to run a bigger check if that is desired.

(And thanks @ymartin59 for fixing the underlying python issue 🙂)

@fastcat
Copy link
Contributor Author

fastcat commented Mar 21, 2020

I've updated this PR for the new release of rdiff-backup 2.0.0 which has now landed in Debian testing. Unfortunately while the repositories (stored backups) are backwards compatible, the live software is not -- you need 2.0 on both client and server, or neither.

The former patches are all gone now, and it now uses python3 instead of python 2.7.

Edit: This initial attempt at updating to 2.0 isn't working properly. I'm investigating.

@fastcat
Copy link
Contributor Author

fastcat commented Mar 21, 2020

I'm a bit stymied again ... it seems the current python3 package generates a broken virtualenv 'binary' as it's missing the appdirs package and others

@fastcat fastcat force-pushed the fix/rdiff-backup-deb-patches branch from 932a608 to 7550d27 Compare March 21, 2020 19:57
@fastcat
Copy link
Contributor Author

fastcat commented Mar 21, 2020

I've addressed the python3 virtualenv issues in #3928, but I'm still having issues with the postinst step here. I can run the steps manually and they work, but they don't seem to be running when installing the package, whether on upgrade or uninstall/reinstall.

@fastcat fastcat force-pushed the fix/rdiff-backup-deb-patches branch from 7550d27 to 2fb841a Compare March 22, 2020 04:37
@fastcat
Copy link
Contributor Author

fastcat commented Mar 22, 2020

OK, postinst issues fixed, they were my own fault from things I did trying to debug the virtualenv issue

@fastcat fastcat force-pushed the fix/rdiff-backup-deb-patches branch from 2fb841a to 42d337f Compare April 8, 2020 22:27
@hgy59 hgy59 mentioned this pull request Apr 29, 2020
28 tasks
@hgy59
Copy link
Contributor

hgy59 commented Jun 25, 2020

rdiff-backup is already updated to v2.0.3 and librsync to v2.3.0 with the merge of #3648.

@fastcat
Copy link
Contributor Author

fastcat commented Jun 26, 2020

👍

@fastcat fastcat closed this Jun 26, 2020
@fastcat fastcat deleted the fix/rdiff-backup-deb-patches branch August 31, 2020 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants