Created attachment 247402 [details] Switch upstream As the otiginal upstream has mostly been unmaintained and FreeBSD fork has gain some momentum due to it's usage switch the port to use FreeBSD's fork. If the current maintainer is not willing to maintain anymore I would be to take over.
I think it's safe to do it now. As discussed with Julio, he wants to change the ownership of the repository to FreeBSD organization on GitHub. While there was already freebsd/kyua fork, and now the two repositories are divergent. It's a bit pity, but we can probably take this chance to integrate them and make the one on FreeBSD's official. I suggest we may take these actions to preserve the history: - Rename freebsd/kyua to freebsd/kyua-foo (I'm not sure which suffix is good) - Ask Julio to transfer ownership to freebsd org - Merge the changes in freebsd/kyua-foo to freebsd/kyua - Merge the PRs in freebsd/kyua-foo to freebsd/kyua - Archive freebsd/kyua-foo If there is a more efficient way to do so, let's do it. Note that there is another related project, atf, which needs the same treatment.
I don't think we are totally divergent. We are just ahead of the commits. Renaming freebsd/kyua is a bad idea as the vendor import of src is based on the fork of freebsd not the original one. Actually there are three in total kyua, atf and lutok. I think there are other APIs available to merge PR/Issues in between. So what we will need to do is create a third account under which we will acquire the ownership and then with other tools merge the PRs and Issues. I have done this a couple of years ago but haven't checked the latest API docs so not sure entirely about this either as they regularly change their APIs.
(In reply to Muhammad Moinur Rahman from comment #2) Renaming is safe as you mentioned because the freebsd/kyua fork is just having some more commits. The vendor import record is unaffected as long as the commit hashes are the same, which is true when we fast-forward the additional commits. Moving the ahead commit from freebsd/kyua fork to original one is better because the jmmv/kyua has longer history which contains the PR# and issue#, it would be nice to be sync'd with the repo, although we may still have some fewer # come from original freebsd/kyua but it can be referenced in the archived old fork. Anyway, for this devel/kyua ports I believe it's fine to switch upstream, as we all want freebsd/kyua as the official upstream. We can seek more inputs and deal with this merge later.
I have to check if we fast forward commits on top of the one from jmmv whether if it retains the hashes or not. And about getting hold of the original repo I am not sure whether if you actually have access to him At the moment the email address is forwarded to procmail and all mails are saved in freefall home directory. Also there has been no login from his side in the freefall since January 2022. So far now I am committing this and atf with the one from FreeBSD fork.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=7278592dafeab418642a00203b1134285be7f1a3 commit 7278592dafeab418642a00203b1134285be7f1a3 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-03 05:19:19 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-03 05:27:54 +0000 devel/lutok: Switch to FreeBSD upstream - As per the recent discussion switch to the FreeBSD upstream - For now resetting MAINTAINER to myself with ci@ hat on but anyone from ci@ feel free to commit - Pet port{clippy|fmt} PR: 276071 Approved by: jmmv (private mail) devel/lutok/Makefile | 71 ++++++++--------- devel/lutok/distinfo | 5 +- devel/lutok/pkg-plist | 210 -------------------------------------------------- 3 files changed, 36 insertions(+), 250 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=46cb35fc19b7733d0bae04a867013ef9ac66fb41 commit 46cb35fc19b7733d0bae04a867013ef9ac66fb41 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-03 05:15:35 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-03 05:27:54 +0000 devel/atf: Switch to FreeBSD upstream - As per the recent discussion switch to the FreeBSD upstream - For now resetting MAINTAINER to myself with ci@ hat on but anyone from ci@ feel free to commit - Pet port{clippy|fmt} PR: 276071 Approved by: jmmv (private mail) devel/atf/Makefile | 33 ++++++++++++--------------------- devel/atf/distinfo | 5 +++-- 2 files changed, 15 insertions(+), 23 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=6963b8318f5627ab2ffdeb25478cc7bae7a97f40 commit 6963b8318f5627ab2ffdeb25478cc7bae7a97f40 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2024-01-03 05:23:52 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2024-01-03 05:27:55 +0000 devel/kyua: Switch to FreeBSD upstream - As per the recent discussion switch to the FreeBSD upstream - For now resetting MAINTAINER to myself with ci@ hat on but anyone from ci@ feel free to commit - Pet port{clippy|fmt} PR: 276071 Approved by: jmmv (private mail) devel/kyua/Makefile | 11 ++++++----- devel/kyua/distinfo | 6 +++--- devel/kyua/files/patch-utils_datetime.cpp (gone) | 20 -------------------- .../kyua/files/patch-utils_datetime__test.cpp (gone) | 19 ------------------- devel/kyua/pkg-plist | 1 + 5 files changed, 10 insertions(+), 47 deletions(-)
Have switched all three necessary ports to the FreeBSD upstream. But keeping this open for discussion.
I think we are done with this, however if anyone needs anything new out of here please reopen.