svn commit: r477033 - in branches/2018Q3/devel/cgit: . files

[Thomas Zander]

Author: riggs
Date: Sun Aug 12 17:50:11 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 at utahime.org>
  Approved by:	Marko Turk <mt at 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 at utahime.org
  Approved by:	mt at markoturk.info (maintainer)
  Security:	CVE-2018-14912
  
  Approved by:	ports-secteam (riggs)

Deleted:
  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
Modified:
  branches/2018Q3/devel/cgit/Makefile
  branches/2018Q3/devel/cgit/distinfo
  branches/2018Q3/devel/cgit/pkg-plist
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/devel/cgit/Makefile
==============================================================================
--- branches/2018Q3/devel/cgit/Makefile	Sun Aug 12 17:35:18 2018	(r477032)
+++ branches/2018Q3/devel/cgit/Makefile	Sun Aug 12 17:50:11 2018	(r477033)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cgit
-PORTVERSION=	1.1
-PORTREVISION=	18
+PORTVERSION=	1.2.1
 CATEGORIES=	devel www
 MASTER_SITES=	http://git.zx2c4.com/cgit/snapshot/:cgit \
 		https://www.kernel.org/pub/software/scm/git/:git
@@ -17,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	msgfmt:devel/gettext-tools
 
-GIT_VERSION=	2.16.3
+GIT_VERSION=	2.18.0
 USES=		cpe gmake iconv perl5 python:env shebangfix ssl tar:xz
 CPE_VENDOR=	lars_hjemli
 USE_PERL5=	test

Modified: branches/2018Q3/devel/cgit/distinfo
==============================================================================
--- branches/2018Q3/devel/cgit/distinfo	Sun Aug 12 17:35:18 2018	(r477032)
+++ branches/2018Q3/devel/cgit/distinfo	Sun Aug 12 17:50:11 2018	(r477033)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1521825342
-SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890
-SIZE (cgit-1.1.tar.xz) = 86268
-SHA256 (git-2.16.3.tar.xz) = d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48
-SIZE (git-2.16.3.tar.xz) = 4966248
+TIMESTAMP = 1533411742
+SHA256 (cgit-1.2.1.tar.xz) = 3c547c146340fb16d4134326e7524bfb28ffa681284f1e3914bde1c27a9182bf
+SIZE (cgit-1.2.1.tar.xz) = 89648
+SHA256 (git-2.18.0.tar.xz) = 8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
+SIZE (git-2.18.0.tar.xz) = 5102264

Modified: branches/2018Q3/devel/cgit/pkg-plist
==============================================================================
--- branches/2018Q3/devel/cgit/pkg-plist	Sun Aug 12 17:35:18 2018	(r477032)
+++ branches/2018Q3/devel/cgit/pkg-plist	Sun Aug 12 17:50:11 2018	(r477033)
@@ -3,6 +3,7 @@ lib/cgit/filters/commit-links.sh
 lib/cgit/filters/email-gravatar.lua
 lib/cgit/filters/email-gravatar.py
 lib/cgit/filters/email-libravatar.lua
+lib/cgit/filters/file-authentication.lua
 lib/cgit/filters/gentoo-ldap-authentication.lua
 lib/cgit/filters/html-converters/man2html
 lib/cgit/filters/html-converters/md2html