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
Conversation
c4d6f5d
to
f0aa00c
Compare
Rebased to the latest master. |
I am not sure about how the
|
It might make sense to revbump yes. It's definitely safer if nothing else. |
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. |
Some rather major changes to this PR, based on the suggestions of @ahesford:
|
srcpkgs/radicale/INSTALL.msg
Outdated
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 |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
vinstall radicale.fcgi 644 usr/share/radicale | ||
vinstall radicale.wsgi 644 usr/share/radicale | ||
vsv radicale | ||
} | ||
|
||
radicale2_package() { | ||
depends="radicale" |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
depends="${sourcepkg}>=${version}_${revision}"
Also the commit message is wrong. |
srcpkgs/radicale/template
Outdated
|
||
distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz" | ||
checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c | ||
provides="radicale-${version}_${revision}" |
There was a problem hiding this comment.
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.
srcpkgs/radicale/INSTALL.msg
Outdated
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: |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
srcpkgs/radicale/template
Outdated
short_desc="Complete calendar and contact storing and manipulating solution" | ||
maintainer="lemmi <lemmi@nerd2nerd.org>" | ||
maintainer="projectmoon <projectmoon@agnos.is>" |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just saw his comment.
srcpkgs/radicale/template
Outdated
vinstall radicale.fcgi 644 usr/share/radicale | ||
vinstall radicale.wsgi 644 usr/share/radicale | ||
vsv radicale | ||
} | ||
|
||
radicale2_package() { | ||
depends="radicale" |
There was a problem hiding this comment.
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/radicale/INSTALL.msg
Outdated
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 |
There was a problem hiding this comment.
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/INSTALL.msg
Outdated
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: |
There was a problem hiding this comment.
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.
@ProjectMoon thanks for stepping up, just my 2 cents: |
This sounds good, but then we need to make a breaking change to the package tree, right? |
I'm not crazy about splitting to Maybe the
|
@lemmi perhaps you can hold the |
Due to branch reorganization, GitHub closed this PR. New PR at: #23908 |
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.