diff --git a/www/gitea/Makefile b/www/gitea/Makefile index e7591a35e7f0..fa1dad06326e 100644 --- a/www/gitea/Makefile +++ b/www/gitea/Makefile @@ -2,11 +2,10 @@ PORTNAME= gitea DISTVERSIONPREFIX= v -DISTVERSION= 1.11.8 +DISTVERSION= 1.12.2 CATEGORIES= www MASTER_SITES= https://github.com/go-gitea/gitea/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ DISTNAME= gitea-src-${DISTVERSION} -NO_WRKSUBDIR= yes MAINTAINER= stb@lassitu.de COMMENT= Compact self-hosted Git service @@ -18,6 +17,8 @@ RUN_DEPENDS= git:devel/git USES= gmake go:no_targets USE_RC_SUBR= gitea +NO_WRKSUBDIR= yes +PORTDATA= * SUB_FILES+= app.ini.sample SUB_LIST+= GITUSER=${USERS} @@ -49,9 +50,6 @@ DAEMONARGS= -f SUB_LIST+= DAEMONARGS="${DAEMONARGS}" SSP_UNSAFE= true -# use sane defaults for path, overriden with actual PREFIX in start script -EXTRA_LDFLAGS= -X code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/gitea -EXTRA_LDFLAGS+= -X code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/gitea # Default LDFLAGS are incompatible with build MAKE_ENV= LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" MAKE_ARGS= GOPATH=${WRKDIR} TAGS="${GO_TAGS}" diff --git a/www/gitea/distinfo b/www/gitea/distinfo index 1e7764efd54b..894116ed748e 100644 --- a/www/gitea/distinfo +++ b/www/gitea/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1593337278 -SHA256 (gitea-src-1.11.8.tar.gz) = f4f965bd8f7da9320b6693c249eab07ff8baf5ef81649fd9025133f91391bab8 -SIZE (gitea-src-1.11.8.tar.gz) = 68927493 +TIMESTAMP = 1595065693 +SHA256 (gitea-src-1.12.2.tar.gz) = 695dae81327bdfaa4adaa9d3dc9d2bdcb78d54ac73abac3a630750465858ff8b +SIZE (gitea-src-1.12.2.tar.gz) = 135139394 diff --git a/www/gitea/files/gitea.in b/www/gitea/files/gitea.in index 2bb8dd18c124..3f5149fffc23 100644 --- a/www/gitea/files/gitea.in +++ b/www/gitea/files/gitea.in @@ -22,6 +22,7 @@ load_rc_config $name : ${gitea_facility:="daemon"} : ${gitea_priority:="debug"} : ${gitea_shared:="%%PREFIX%%/share/${name}"} +: ${gitea_custom:="%%PREFIX%%/etc/${name}"} command="%%PREFIX%%/sbin/${name} web" procname="%%PREFIX%%/sbin/${name}" @@ -36,7 +37,7 @@ gitea_start() { -u ${gitea_user} -p ${pidfile} \ /usr/bin/env -i \ "GITEA_WORK_DIR=${gitea_shared}" \ - "GITEA_CUSTOM=%%PREFIX%%/etc/${name}" \ + "GITEA_CUSTOM=${gitea_custom}" \ "HOME=${githome}" \ "PATH=%%PREFIX%%/bin:${PATH}" \ "USER=${gitea_user}" \ diff --git a/www/gitea/files/patch-vendor_github.com_go-git_go-git_v5_storage_filesystem_dotgit_dotgit.go b/www/gitea/files/patch-vendor_github.com_go-git_go-git_v5_storage_filesystem_dotgit_dotgit.go deleted file mode 100644 index 3495216f5738..000000000000 --- a/www/gitea/files/patch-vendor_github.com_go-git_go-git_v5_storage_filesystem_dotgit_dotgit.go +++ /dev/null @@ -1,38 +0,0 @@ -# This patch fixes a bug where attempting to view branches with a / in the name -# would return an HTTP 500 Internal Server Error. The underlying issue ended up -# being that go-git implicitly relied on read() of a dirfd to succeed, so for a -# branch named "stable/11" it would stop and assume "stable" was the ref, but it -# was really just a directory. - -# This patch was accepted upstream here: -# https://github.com/go-git/go-git/pull/39 -# go-gitea is expected to merge it when go-git creates a new release for them to -# import, and this patch can silently go away as soon as it conflicts. - ---- vendor/github.com/go-git/go-git/v5/storage/filesystem/dotgit/dotgit.go.orig 2020-04-01 17:02:04 UTC -+++ vendor/github.com/go-git/go-git/v5/storage/filesystem/dotgit/dotgit.go -@@ -57,6 +57,9 @@ var ( - // targeting a non-existing object. This usually means the repository - // is corrupt. - ErrSymRefTargetNotFound = errors.New("symbolic reference target not found") -+ // ErrIsDir is returned when a reference file is attempting to be read, -+ // but the path specified is a directory. -+ ErrIsDir = errors.New("reference path is a directory") - ) - - // Options holds configuration for the storage. -@@ -926,6 +929,14 @@ func (d *DotGit) addRefFromHEAD(refs *[]*plumbing.Refe - - func (d *DotGit) readReferenceFile(path, name string) (ref *plumbing.Reference, err error) { - path = d.fs.Join(path, d.fs.Join(strings.Split(name, "/")...)) -+ st, err := d.fs.Stat(path) -+ if err != nil { -+ return nil, err -+ } -+ if st.IsDir() { -+ return nil, ErrIsDir -+ } -+ - f, err := d.fs.Open(path) - if err != nil { - return nil, err diff --git a/www/gitea/pkg-message b/www/gitea/pkg-message index dd2cd5d4f231..9d56799d63f2 100644 --- a/www/gitea/pkg-message +++ b/www/gitea/pkg-message @@ -1,5 +1,5 @@ [ -{ type: install +{ type: upgrade maximum_version: 1.7.6 message: <