Bug 227536 - devel/cgit: Update included git to 2.17.1
Summary: devel/cgit: Update included git to 2.17.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2018-04-15 21:35 UTC by Yasuhiro Kimura
Modified: 2018-08-12 17:50 UTC (History)
4 users (show)

See Also:
mt-bugs: maintainer-feedback-


Attachments
patch file (2.21 KB, patch)
2018-04-15 21:35 UTC, Yasuhiro Kimura
no flags Details | Diff
updated patch file (2.21 KB, patch)
2018-05-29 22:24 UTC, Yasuhiro Kimura
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yasuhiro Kimura freebsd_committer freebsd_triage 2018-04-15 21:35:51 UTC
Created attachment 192538 [details]
patch file

Update included git to 2.17.0. Patch is obtained from upstream.
Comment 1 Marko Turk 2018-04-21 19:40:23 UTC
(In reply to Yasuhiro KIMURA from comment #0)
Hi,

this commit is not on cgit's master branch yet. Should we wait before applying this patch?

/Marko
Comment 2 Yasuhiro Kimura freebsd_committer freebsd_triage 2018-05-29 22:24:18 UTC
Created attachment 193830 [details]
updated patch file

Update patch to update included git to 2.17.1.
Comment 3 Kurt Jaeger freebsd_committer freebsd_triage 2018-06-29 18:38:05 UTC
Is there any chance to use the git port instead of relying on some included
git version ? (I did not look at the port, I'm just curious 8-})
Comment 4 Martin Wilke freebsd_committer freebsd_triage 2018-07-04 03:15:40 UTC
(In reply to Kurt Jaeger from comment #3)
I also wonder if that would be possible?
Comment 5 Yasuhiro Kimura freebsd_committer freebsd_triage 2018-07-05 15:22:57 UTC
(In reply to Kurt Jaeger from comment #3)

At least it is impossible for devel/cgit to use devel/git to build itself because

* libgit.a and probably some header files are required to build cgit.
* But devel/git doesn't include them in its package.

It may be possible to change devel/git so its package includes libgit.a and header files. But I'm not sure if it is worth doing.
Comment 6 commit-hook freebsd_committer freebsd_triage 2018-07-06 11:53:23 UTC
A commit references this bug:

Author: miwi
Date: Fri Jul  6 11:53:07 UTC 2018
New revision: 474007
URL: https://svnweb.freebsd.org/changeset/ports/474007

Log:
  - Update included git to 2.17.1

  PR:		227536

Changes:
  head/devel/cgit/Makefile
  head/devel/cgit/distinfo
  head/devel/cgit/files/patch-git-2.17
Comment 7 Charlie Li freebsd_committer freebsd_triage 2018-07-06 22:29:42 UTC
The latest patch does not apply correctly. patch rejects the ui-shared.c portion.
Comment 8 Marko Turk 2018-07-07 09:25:19 UTC
Hi,

new version of cgit will be released soon, which will also include this patch:
https://lists.zx2c4.com/pipermail/cgit/2018-July/004139.html

I think we can wait for this new release and then I'll update it.

Is that OK?

BR,
Marko
Comment 9 commit-hook freebsd_committer freebsd_triage 2018-07-07 13:26:46 UTC
A commit references this bug:

Author: tobik
Date: Sat Jul  7 13:26:31 UTC 2018
New revision: 474079
URL: https://svnweb.freebsd.org/changeset/ports/474079

Log:
  devel/cgit: Fix patch

  PR:		227536

Changes:
  head/devel/cgit/files/patch-git-2.17
Comment 10 commit-hook freebsd_committer freebsd_triage 2018-08-12 17:50:31 UTC
A commit references this bug:

Author: riggs
Date: Sun Aug 12 17:50:12 UTC 2018
New revision: 477033
URL: https://svnweb.freebsd.org/changeset/ports/477033

Log:
  MFH: r474007 r474079 r474827 r477003

  - Update included git to 2.17.1

  PR:		227536

  devel/cgit: Fix patch

  PR:		227536

  devel/cgit: update 1.1 -> 1.2

  - among other things, update to git 2.18

  PR:		229841
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
  Approved by:	Marko Turk <mt@markoturk.info> (maintainer)
  Relnotes:	https://lists.zx2c4.com/pipermail/cgit/2018-July/004160.html

  Update to upstream release 1.2.1 (Fixes CVE-2018-14912)

  PR:		230361
  Submitted by:	yasu@utahime.org
  Approved by:	mt@markoturk.info (maintainer)
  Security:	CVE-2018-14912

  Approved by:	ports-secteam (riggs)

Changes:
_U  branches/2018Q3/
  branches/2018Q3/devel/cgit/Makefile
  branches/2018Q3/devel/cgit/distinfo
  branches/2018Q3/devel/cgit/files/patch-git-2.12.0
  branches/2018Q3/devel/cgit/files/patch-git-2.13.1
  branches/2018Q3/devel/cgit/files/patch-git-2.14
  branches/2018Q3/devel/cgit/files/patch-git-2.16
  branches/2018Q3/devel/cgit/files/patch-ui-snapshot.c
  branches/2018Q3/devel/cgit/pkg-plist
Comment 11 commit-hook freebsd_committer freebsd_triage 2018-08-12 17:50:33 UTC
A commit references this bug:

Author: riggs
Date: Sun Aug 12 17:50:12 UTC 2018
New revision: 477033
URL: https://svnweb.freebsd.org/changeset/ports/477033

Log:
  MFH: r474007 r474079 r474827 r477003

  - Update included git to 2.17.1

  PR:		227536

  devel/cgit: Fix patch

  PR:		227536

  devel/cgit: update 1.1 -> 1.2

  - among other things, update to git 2.18

  PR:		229841
  Submitted by:	Yasuhiro KIMURA <yasu@utahime.org>
  Approved by:	Marko Turk <mt@markoturk.info> (maintainer)
  Relnotes:	https://lists.zx2c4.com/pipermail/cgit/2018-July/004160.html

  Update to upstream release 1.2.1 (Fixes CVE-2018-14912)

  PR:		230361
  Submitted by:	yasu@utahime.org
  Approved by:	mt@markoturk.info (maintainer)
  Security:	CVE-2018-14912

  Approved by:	ports-secteam (riggs)

Changes:
_U  branches/2018Q3/
  branches/2018Q3/devel/cgit/Makefile
  branches/2018Q3/devel/cgit/distinfo
  branches/2018Q3/devel/cgit/files/patch-git-2.12.0
  branches/2018Q3/devel/cgit/files/patch-git-2.13.1
  branches/2018Q3/devel/cgit/files/patch-git-2.14
  branches/2018Q3/devel/cgit/files/patch-git-2.16
  branches/2018Q3/devel/cgit/files/patch-ui-snapshot.c
  branches/2018Q3/devel/cgit/pkg-plist