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

etesync-dav upgrade to 0.18.1, new package radicale3 #22810

Closed
wants to merge 0 commits into from

Conversation

ProjectMoon
Copy link
Contributor

This upgrades etesync-dav to 0.18.1, which requires radicale 3.x. So there's also a commit adding radicale3, and making it conflict with radicale and radicale2.

@ProjectMoon
Copy link
Contributor Author

Rebased to the latest master.

@Piraty
Copy link
Member

Piraty commented Jul 5, 2020

I am not sure about how the conflicts= logic works.

  • does the mechanism require all packages to explicitly list all of the others in order to work correctly (@Duncaen ?)
  • in that case, you should revbump the old packages so the binary packages are updated

@ProjectMoon
Copy link
Contributor Author

It might make sense to revbump yes. It's definitely safer if nothing else.

@CameronNemo
Copy link
Contributor

CameronNemo commented Jul 18, 2020

Why keep radicale2? The only reason we kept radicale 1 was so that old data could be migrated to version 2. But version 3 only changes a few config keys, it does not change the data format.

@ProjectMoon
Copy link
Contributor Author

Some rather major changes to this PR, based on the suggestions of @ahesford:

  • The radicale3 package was removed, and instead the radicale package now has radicale3.
  • The radicale2 package has been turned into a transitional package pointing to radicale.
  • Essentially, we are dropping radicale2, and using the original package to upgrade to the latest version of Radicale.
  • Configs for Radicale placed in /usr/share/examples in case of upgrade from old versions when /etc/radicale is not touched.
  • Updated INSTALL.msg for Radicale.

etesync-dav upgraded to 0.20.0, and depends on the upgraded radicale package.

Comment on lines 3 to 6
package. To remove radicale2 and transition to the radicale package:

If you need to migrate data, take the following steps:
xbps-pkgdb -m manual radicale
xbps-remove radicale2
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this last part is necessary. Having a dummy package around isn't an issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not an issue per se, no. But it makes the system cleaner.

Copy link
Member

Choose a reason for hiding this comment

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

Yes, but it also makes an already long INSTALL.msg even longer.

Copy link
Member

Choose a reason for hiding this comment

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

This install msg needs to be huge, I don't think we should make it bigger for something that brings little value. People who care about the amount of packages they have know how to fix this.

Copy link
Member

Choose a reason for hiding this comment

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

This whole INSTALL.msg should be gutted. The last version of radicale v1 is three years old. We should not try to hold users' hands by dumping long instructions that are unlikely to be read anyway. The entire contents of this file should be eliminated and replaced with this simple message:

CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x. If you are upgrading from Radicale 1.x, please consult upstream documentation for information about migrating existing data to the format used by this version.

Note that https://radicale.org/1to2 now returns 404, so even Radicale is not interested in helping users migrate from a long-dead version. This is not our problem to solve. If somebody is interested enough, the information can be found in the Wayback Machine.

srcpkgs/radicale/template Outdated Show resolved Hide resolved
vinstall radicale.fcgi 644 usr/share/radicale
vinstall radicale.wsgi 644 usr/share/radicale
vsv radicale
}

radicale2_package() {
depends="radicale"
Copy link
Member

Choose a reason for hiding this comment

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

You might need something like radicale>=3, not sure.

Copy link
Member

Choose a reason for hiding this comment

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

depends="${sourcepkg}>=${version}_${revision}"

srcpkgs/radicale3/template Outdated Show resolved Hide resolved
@ericonr
Copy link
Member

ericonr commented Jul 22, 2020

Also the commit message is wrong.


distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c
provides="radicale-${version}_${revision}"
Copy link
Member

Choose a reason for hiding this comment

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

It shouldn't need provides any more.

Comment on lines 8 to 10
Migration from version 1.x to 2.x and beyond is not backwards
compatible. Migration of data from 2.x to 3.x is not necessary. If you
need to migrate data from 1.x to 2.x, take the following steps:
Copy link
Member

Choose a reason for hiding this comment

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

The migration instructions need to be updated as well.

Copy link
Member

Choose a reason for hiding this comment

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

See prior comment about dropping all of this text in favor of a simple message noting the incompatibility.

short_desc="Complete calendar and contact storing and manipulating solution"
maintainer="lemmi <lemmi@nerd2nerd.org>"
maintainer="projectmoon <projectmoon@agnos.is>"
Copy link
Member

Choose a reason for hiding this comment

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

Did @lemmi ask you to take over this template?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No. This was copied from the template for radicale3. Do you want me to change the maintainer back?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just saw his comment.

vinstall radicale.fcgi 644 usr/share/radicale
vinstall radicale.wsgi 644 usr/share/radicale
vsv radicale
}

radicale2_package() {
depends="radicale"
Copy link
Member

Choose a reason for hiding this comment

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

depends="${sourcepkg}>=${version}_${revision}"

Comment on lines 3 to 6
package. To remove radicale2 and transition to the radicale package:

If you need to migrate data, take the following steps:
xbps-pkgdb -m manual radicale
xbps-remove radicale2
Copy link
Member

Choose a reason for hiding this comment

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

This whole INSTALL.msg should be gutted. The last version of radicale v1 is three years old. We should not try to hold users' hands by dumping long instructions that are unlikely to be read anyway. The entire contents of this file should be eliminated and replaced with this simple message:

CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x. If you are upgrading from Radicale 1.x, please consult upstream documentation for information about migrating existing data to the format used by this version.

Note that https://radicale.org/1to2 now returns 404, so even Radicale is not interested in helping users migrate from a long-dead version. This is not our problem to solve. If somebody is interested enough, the information can be found in the Wayback Machine.

Comment on lines 8 to 10
Migration from version 1.x to 2.x and beyond is not backwards
compatible. Migration of data from 2.x to 3.x is not necessary. If you
need to migrate data from 1.x to 2.x, take the following steps:
Copy link
Member

Choose a reason for hiding this comment

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

See prior comment about dropping all of this text in favor of a simple message noting the incompatibility.

@lemmi
Copy link
Member

lemmi commented Jul 23, 2020

@ProjectMoon thanks for stepping up, just my 2 cents:
I don't have the capacity to maintain any of the newer radicale variants and I'm still running radicale 1, so I propose this:
We rename radicale to radicale1 and make radicale the package that tracks the newest radicale 3 release. Should I finally be able to also make the transition, I'll deprecate radicale1.

@ProjectMoon
Copy link
Contributor Author

@ProjectMoon thanks for stepping up, just my 2 cents:
I don't have the capacity to maintain any of the newer radicale variants and I'm still running radicale 1, so I propose this:
We rename radicale to radicale1 and make radicale the package that tracks the newest radicale 3 release. Should I finally be able to also make the transition, I'll deprecate radicale1.

This sounds good, but then we need to make a breaking change to the package tree, right?

@ahesford
Copy link
Member

I'm not crazy about splitting to radicale1 and updating radicale to v3. It's not much better than making radicale3. An inability to upgrade from the old radicale package sounds like an argument for holding local package versions, rather than altering the package tree to accomodate outdated software.

Maybe the INSTALL.msg for an updated radicale could include some basic instructions for reverting to an old version if that is required by some users:

CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x. If you are upgrading from Radicale 1.x, please consult upstream documentation for information about migrating existing data to the format used by this version.

If you are unable to upgrade but require Radicale 1.x to function, you can install the xtools package and run

	xdowngrade /var/cache/xbps/radicale-<version>.<arch>.xbps
	xbps-pkgdb -m hold radicale

for your architecture and locally cached version number.

If you do not have a cached version of the package, you can install an unmanaged version with, for example

	pip install radicale<2

You may wish to use a virtual environment to isolate pip-installed packages from system-managed packages.

@CameronNemo
Copy link
Contributor

@lemmi perhaps you can hold the radicale package for updates, seeing as the 1.x branch is not and probably will not receive any updates moving forward?

@ProjectMoon
Copy link
Contributor Author

Due to branch reorganization, GitHub closed this PR. New PR at: #23908

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 17, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants