Page MenuHomeFreeBSD

Upgrade gitlab to 11.0.2
ClosedPublic

Authored by mfechner on Jul 4 2018, 4:17 PM.

Details

Summary

At first I will split this commit into several small one for each port but I think it is easier to review it as one single diff.

I will write clear commit messages for each commit.
Please note the the port gitlab will be renamed to gitlab-ce to match name on gitlab.org.
github does or at least had not the important security release 11.0.2.

I also created a MOVED entry and UPDATING entry to make that clear. I will adapt the date to the date I commit the gitlab update itself.

I will use svn move to rename the gitlab port and will then include the necessary changes.

Test Plan

I tested this version very carefully.
I did two upgrades following the manual, did a new installation using vagrant (https://gitlab.fechner.net/mfechner/Gitlab-vagrant) which was created by swills.
Everything is fine.

Oh to mention I tested also this list of ports to make sure the rubygem-rdoc update does not break anything:

  1. Test all port depending on rubygem-rdoc
  2. grep rubygem-rdoc INDEX-11 |cut -f1 -d\|

devel/rubygem-active_scaffold
devel/rubygem-deface
devel/rubygem-gettext_i18n_rails_js
devel/rubygem-gettext_i18n_rails_js12
devel/rubygem-health_check26
devel/rubygem-jeweler
devel/rubygem-rdoc
devel/rubygem-sdoc
japanese/rubygem-jpmobile4
net/rubygem-gitaly
textproc/rubygem-rich
www/redmine
www/redmine-a_common_libs
www/redmine-backlogs
www/redmine-basecamp
www/redmine-default_assign
www/redmine-graphs
www/redmine-http-auth
www/redmine-issue_templates
www/redmine-knowledgebase
www/redmine-ldap_sync
www/redmine-qa_contact
www/redmine-redcarpet_formatter
www/redmine-sidebar_hide
www/redmine-single_auth
www/redmine-wiki_notes
www/rubygem-dropzonejs-rails
www/rubygem-dropzonejs-rails07
www/rubygem-rails-settings-cached
www/rubygem-rails4
www/rubygem-rails_autolink

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mfechner created this revision.Jul 4 2018, 4:17 PM
mfechner edited the test plan for this revision. (Show Details)Jul 4 2018, 4:20 PM
swills added a comment.Jul 4 2018, 4:30 PM

See comments inline.

devel/gitaly/files/patch-config.toml.example
7 ↗(On Diff #44860)

Doesn't have to be now, but at some point references to /usr/local in these patches should be changed to %%PREFIX%% and then a post-patch target should be added to use @REINPLACE_CMD to change %%PREFIX%% to the value of ${PREFIX}.

devel/rubygem-rdoc/Makefile
4 ↗(On Diff #44860)

And I wanted to delete this port... Oh well... Can you check this update doesn't break www/redmine?

devel/rubygem-sdoc/Makefile
17 ↗(On Diff #44860)

Thanks for fixing these nits.

net/rubygem-gitaly-proto/Makefile
9 ↗(On Diff #44860)

I assume this was OK'd with the maintainer?

www/gitlab-ce/files/patch-config_gitlab.yml.example
8 ↗(On Diff #44860)

Another place to use %%PREFIX%% and @${REINPLACE_CMD}. The result is the same, but it makes things work if people change ${PREFIX}, which is technically supported (and separate from ${LOCALBASE}...). Again, this change doesn't have to be done for this to land.

www/gitlab-ce/pkg-plist
5906 ↗(On Diff #44860)

Interesting, I guess the minimum version you can upgrade from changed? Perhaps something to add to UPDATING too?

mfechner marked 6 inline comments as done.Jul 4 2018, 4:48 PM
mfechner added a subscriber: sunpoet.
mfechner added inline comments.
devel/gitaly/files/patch-config.toml.example
7 ↗(On Diff #44860)

Good tip, added an issue for it to not forget it:
https://gitlab.fechner.net/mfechner/Gitlab/issues/129

devel/rubygem-rdoc/Makefile
4 ↗(On Diff #44860)

I'm not sure how to test redmine, but I installed it and executed the following:

cd /usr/local/www/redmine/
rm Gemfile.lock
bundle install --local
Don't run Bundler as root. Bundler can ask for sudo if it is needed, and installing your bundle as root will break
this application for all non-root users on this machine.
Your Gemfile lists the gem mysql2 (~> 0.4.6) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the version of one of them later.
Resolving dependencies...
Using rake 12.3.1
Using concurrent-ruby 1.0.5
Using i18n 1.0.1
Using minitest 5.11.3
Using thread_safe 0.3.6
Using tzinfo 1.2.5
Using activesupport 4.2.10
Using builder 3.2.3
Using erubis 2.7.0
Using nokogiri 1.8.2
Using rails-deprecated_sanitizer 1.0.3
Using rails-dom-testing 1.0.9
Using crass 1.0.4
Using loofah 2.2.2
Using rails-html-sanitizer 1.0.4
Using actionview 4.2.10
Using rack 1.6.10
Using rack-test 0.8.3
Using actionpack 4.2.10
Using globalid 0.4.1
Using activejob 4.2.10
Using mini_mime 1.0.0
Using mail 2.7.0
Using actionmailer 4.2.10
Using actionpack-xml_parser 1.0.2
Using activemodel 4.2.10
Using arel 6.0.4
Using activerecord 4.2.10
Using public_suffix 3.0.2
Using addressable 2.5.2
Using bundler 1.16.2
Using coderay 1.1.2
Using css_parser 1.6.0
Using daemons 1.2.6
Using eventmachine 1.2.7
Using htmlentities 4.3.4
Using thor 0.20.0
Using railties 4.2.10
Using jquery-rails 4.3.3
Using mime-types-data 3.2016.0521
Using mime-types 3.1
Using mimemagic 0.3.2
Using mysql2 0.4.10
Using net-ldap 0.16.1
Using protected_attributes 1.1.4
Using ruby-openid 2.7.0
Using rack-openid 1.4.2
Using sprockets 3.7.2
Using sprockets-rails 3.2.1
Using rails 4.2.10
Using rbpdf-font 1.19.1
Using rbpdf 1.19.3
Using redcarpet 3.4.0
Using request_store 1.4.1
Using rmagick 2.16.0
Using roadie 3.3.0
Using roadie-rails 1.3.0
Using thin 1.7.2
Bundle complete! 24 Gemfile dependencies, 58 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.

it seems that redmine does not use rdoc or it is not listed as dependency.

net/rubygem-gitaly-proto/Makefile
9 ↗(On Diff #44860)

I asked this by email 24.5.2018 07:53 on the commit mailing list (subject: Re: svn commit: r470735 - head/net/rubygem-gitaly-proto) and 30.6. by private email, but got no feedback yet.
But saw a lot of commit message in the timeframe.

Should I add @sunpoet to reviewer list to ask him that it is ok that I take maintainer of this port?

www/gitlab-ce/files/patch-config_gitlab.yml.example
8 ↗(On Diff #44860)
www/gitlab-ce/pkg-plist
5906 ↗(On Diff #44860)

Good point I will add to the UPDATING that only upgrade from 10.8.5 was tested carefully and will also name this date, will provide with an updated diff if I did this.

mfechner marked 5 inline comments as done.Jul 4 2018, 4:49 PM
mfechner updated this revision to Diff 44862.Jul 4 2018, 4:56 PM

Updated UPDATING entry.

swills accepted this revision.Jul 4 2018, 5:00 PM

Thanks for the info. Approved!

devel/rubygem-rdoc/Makefile
4 ↗(On Diff #44860)

Thanks, that's good enough. It seems rdoc somehow ends up as a dep for redmine, so I wasn't sure. If there's any issue I'll take care of it.

net/rubygem-gitaly-proto/Makefile
9 ↗(On Diff #44860)

Well, that's only a week, and usually we have 2 weeks for timeout. Let's go ahead with the update only for now since this is a security update and when the timeout is reached then change the maintainer.

This revision is now accepted and ready to land.Jul 4 2018, 5:00 PM
This revision was automatically updated to reflect the committed changes.