Page MenuHomeFreeBSD

Fix downloading of packages hosted on gitlab
ClosedPublic

Authored by mfechner on Wed, Apr 7, 3:05 PM.

Details

Reviewers
mat
Group Reviewers
portmgr
Summary

Gitlab changed the address beginning of April you can download packages
from:
curl https://gitlab.com/gitlab-org/gitlab-foss/repository/7efd19e3716ab6f9146052da76d1bd59ec815f2d/archive.tar.gz?dummy=/gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec8
15f2d_GL0.tar.gz
to:
curl https://gitlab.com/gitlab-org/gitlab-foss/-/archive/7efd19e3716ab6f9146052da76d1bd59ec815f2d.tar.gz?dummy=/gitlab-org-gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d_GL0
.tar.gz

The new extracted archive will have a different folder name.
Before it was:
gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d-7efd19e3716ab6f9146052da76d1bd59ec815f2d
now it is:
gitlab-foss-7efd19e3716ab6f9146052da76d1bd59ec815f2d

So all ports using gitlab must regen their distinfo.

This diff also includes an upgrade of gitlab-ce to version 13.10.2, maybe you want only to look to the changes in Mk/bsd.sites.mk.

Test Plan

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

Probably the recent PR254866 could be solved by this review.
However, why should we continue to use the GL_COMMIT instead of adding the tag?
Example: https://gitlab.com/alfix/mixertui/-/archive/v1.4.2/mixertui-v1.4.2.tar.gz adding "GL_TAG = v1.4.2" -> ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/archive/${GL_TAG}/${GL_PROJECT}-${GL_TAG}.tar.gz;
of course GL_TAG could be in another review.

mat requested changes to this revision.Thu, Apr 8, 10:21 AM

This is probably missing changes in bsd.port.mk, around line 1709.

Also, with this change, do all the ports using USE_GITLAB still work?

As this changes the hashes, the review should probably include all affected ports.

This revision now requires changes to proceed.Thu, Apr 8, 10:21 AM

Thanks @mat for the tip, I updated bsd.ports.mk and now it works.

To make it clear, every port that uses gitlab.com currently does not work. They only build, because FreeBSD distcache have the files.

I will later prepare a new diff that updates the distfile for every effected port.

Could you redo the patch without changing anything except the distinfo files, that is, without the gitlab update?

mfechner edited the test plan for this revision. (Show Details)

Updated all dist files and removed gitlab upgrade.

All ports are now building fine, here the last build log of the ports that where failing:
https://pkg.fechner.net/build.html?mastername=122amd64-gitlab&build=2021-04-09_08h42m52s

I think I would rather trust you this all works and let you commit it before too many ports get updated and the patch no longer works.
Can you do it in two commit, one for the Mk bits and one for all the rest?

Thanks, I committed it with two commits and they should be both MFHed to 2021Q2.

I cannot close this review, as it was not fully accepted ;)

This revision is now accepted and ready to land.Mon, Apr 12, 1:31 PM

Committed to main and 2021Q2.