svn commit: r533984 - in branches/2020Q2/www/gitea: . files

Mon May 4 20:39:13 UTC 2020

Author: adamw
Date: Mon May  4 20:39:12 2020
New Revision: 533984
URL: https://svnweb.freebsd.org/changeset/ports/533984

Log:
  MFH: r531612 r531613 r533935
  
  gitea: Update to 1.1.4
  
  Update Gitea to 1.11.4
  
  This release fixes ten bugs.
  
  Release notes: https://blog.gitea.io/2020/04/gitea-1.11.4-is-released/
  
  PR:		245602
  Submitted by:	maintainer
  
  gitea: Add GIT_LFS option
  
  Add a GIT_LFS option (on by default) for environments that don't want to
  make LFS available.
  
  While here, change the pkg-message UCL to only show when upgrading from
  < 1.8.0.
  
  Approved by:	maintainer
  
  gitea: Fix wiki page display
  
  From the PR:
  
  Right now, the version of gitea shipped in ports fails to display wiki
  pages. Any wiki page opened results in the following error:
  
  template: repo/wiki/view:48:14: executing "repo/wiki/view" at <(not
  $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned
  $.ExposeAnonSSH))>: can't give argument to non-function not
  $.DisableHTTP
  
  This is due to extra parentheses in templates/repo/wiki/view.tmpl and
  has already been fixed upstream in [1], [2].
  
  I've pulled the single line template fix from upstream and added the
  patch to our port. As a workaround, users can also fix the problem by
  placing the corrected template in
  /usr/local/etc/gitea/templates/repo/wiki/view.tmpl.
  
  Cheers,
  Sascha
  
  [1] https://github.com/go-gitea/gitea/issues/10552
  [2] https://github.com/zeripath/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce
  
  PR:		246020
  Submitted by:	Sascha Biberhofer
  Approved by:	maintainer
  
  Approved by:	portmgr (with hat)

Added:
  branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl
     - copied unchanged from r533935, head/www/gitea/files/patch-templates_repo_wiki_view.tmpl
Modified:
  branches/2020Q2/www/gitea/Makefile
  branches/2020Q2/www/gitea/distinfo
  branches/2020Q2/www/gitea/pkg-message
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/www/gitea/Makefile
==============================================================================

--- branches/2020Q2/www/gitea/Makefile	Mon May  4 20:35:06 2020	(r533983)
+++ branches/2020Q2/www/gitea/Makefile	Mon May  4 20:39:12 2020	(r533984)
@@ -2,7 +2,8 @@
 
 PORTNAME=	gitea
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11.3
+DISTVERSION=	1.11.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	gitea-src-${DISTVERSION}
@@ -14,8 +15,7 @@ COMMENT=	Compact self-hosted Git service
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	git:devel/git \
-		git-lfs:devel/git-lfs
+RUN_DEPENDS=	git:devel/git
 
 USES=		gmake go:no_targets
 USE_RC_SUBR=	gitea
@@ -26,14 +26,16 @@ SUB_LIST+=	GITUSER=${USERS}
 USERS=		git
 GROUPS=		git
 
-OPTIONS_DEFINE=	BINDATA PAM SQLITE
-OPTIONS_DEFAULT=	PAM SQLITE
+OPTIONS_DEFINE=	BINDATA GIT_LFS PAM SQLITE
+OPTIONS_DEFAULT=	GIT_LFS PAM SQLITE
 OPTIONS_SUB=	yes
 
 BINDATA_DESC=	Build a single monolithic binary, with all assets included
+GIT_LFS_DESC=	Support for Git Large File Storage (LFS)
 PAM_DESC=	Enable support for PAM
 
 BINDATA_VARS=	GO_TAGS+=bindata
+GIT_LFS_RUN_DEPENDS=	git-lfs:devel/git-lfs
 PAM_VARS=	GO_TAGS+=pam
 SQLITE_VARS=	GO_TAGS+="sqlite sqlite_unlock_notify"
 

Modified: branches/2020Q2/www/gitea/distinfo
==============================================================================
--- branches/2020Q2/www/gitea/distinfo	Mon May  4 20:35:06 2020	(r533983)
+++ branches/2020Q2/www/gitea/distinfo	Mon May  4 20:39:12 2020	(r533984)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584565552
-SHA256 (gitea-src-1.11.3.tar.gz) = 5d0b31295788cc81d9f0033d00e509b6798ffeef0b603c4e1360e1762f3b11ec
-SIZE (gitea-src-1.11.3.tar.gz) = 69382786
+TIMESTAMP = 1586790205
+SHA256 (gitea-src-1.11.4.tar.gz) = ee643516bf201296a4ef8cc0d782cddbbd894be2012be1d5fb5746801b9b66a2
+SIZE (gitea-src-1.11.4.tar.gz) = 68915569

Copied: branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl (from r533935, head/www/gitea/files/patch-templates_repo_wiki_view.tmpl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/www/gitea/files/patch-templates_repo_wiki_view.tmpl	Mon May  4 20:39:12 2020	(r533984, copy of r533935, head/www/gitea/files/patch-templates_repo_wiki_view.tmpl)
@@ -0,0 +1,11 @@
+--- templates/repo/wiki/view.tmpl.orig	2020-04-29 07:06:03 UTC
++++ templates/repo/wiki/view.tmpl
+@@ -45,7 +45,7 @@
+ 					{{else if and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)}}
+ 						<input id="repo-clone-url" value="{{$.WikiCloneLink.SSH}}" readonly>
+ 					{{end}}
+-					{{if or ((not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH)))}}
++					{{if or (not $.DisableHTTP) (and (not $.DisableSSH) (or $.IsSigned $.ExposeAnonSSH))}}
+ 						<button class="ui basic icon button poping up clipboard" id="clipboard-btn" data-original="{{.i18n.Tr "repo.copy_link"}}" data-success="{{.i18n.Tr "repo.copy_link_success"}}" data-error="{{.i18n.Tr "repo.copy_link_error"}}" data-content="{{.i18n.Tr "repo.copy_link"}}" data-variation="inverted tiny" data-clipboard-target="#repo-clone-url">
+ 							<i class="octicon octicon-clippy"></i>
+ 						</button>

Modified: branches/2020Q2/www/gitea/pkg-message
==============================================================================
--- branches/2020Q2/www/gitea/pkg-message	Mon May  4 20:35:06 2020	(r533983)
+++ branches/2020Q2/www/gitea/pkg-message	Mon May  4 20:39:12 2020	(r533984)
@@ -1,5 +1,6 @@
 [
 { type: install
+  maximum_version: 1.7.6
   message: <<EOM
 When upgrading from Gitea 1.7 or earlier, Gitea requires the addition of
 another secret to the config file in order to start up.  Either manually add
