svn commit: r471817 - in branches/2018Q2/www/gitlab-pages: . files
Matthias Fechner
mfechner at FreeBSD.org
Tue Jun 5 20:16:49 UTC 2018
Author: mfechner
Date: Tue Jun 5 20:16:46 2018
New Revision: 471817
URL: https://svnweb.freebsd.org/changeset/ports/471817
Log:
MFH: r468171 r470353
www/gitlab-pages: fix rc script
www/gitlab-pages: update to 0.9.1
Approved by: ports-secteam (eadler)
Added:
branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__fileno.go
- copied unchanged from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__fileno.go
branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__ino.go
- copied unchanged from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__ino.go
branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir.go
- copied unchanged from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir.go
branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir__unix.go
- copied unchanged from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir__unix.go
branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_walk.go
- copied unchanged from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_walk.go
Modified:
branches/2018Q2/www/gitlab-pages/Makefile
branches/2018Q2/www/gitlab-pages/distinfo
branches/2018Q2/www/gitlab-pages/files/gitlab_pages.in
Directory Properties:
branches/2018Q2/ (props changed)
Modified: branches/2018Q2/www/gitlab-pages/Makefile
==============================================================================
--- branches/2018Q2/www/gitlab-pages/Makefile Tue Jun 5 20:06:10 2018 (r471816)
+++ branches/2018Q2/www/gitlab-pages/Makefile Tue Jun 5 20:16:46 2018 (r471817)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gitlab-pages
-PORTVERSION= 0.7.1
+PORTVERSION= 0.9.1
CATEGORIES= www
MAINTAINER= swills at FreeBSD.org
@@ -15,7 +15,7 @@ BUILD_DEPENDS= go:lang/go
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-pages/tags
-GL_COMMIT= 4e11c8392935e1f4dbd96066f3cbb8d657afd874
+GL_COMMIT= 69b7e196fe0336c91a44da72110f44c2ec0869b0
PLIST_FILES= bin/gitlab-pages
Modified: branches/2018Q2/www/gitlab-pages/distinfo
==============================================================================
--- branches/2018Q2/www/gitlab-pages/distinfo Tue Jun 5 20:06:10 2018 (r471816)
+++ branches/2018Q2/www/gitlab-pages/distinfo Tue Jun 5 20:16:46 2018 (r471817)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523370266
-SHA256 (gitlab-org-gitlab-pages-4e11c8392935e1f4dbd96066f3cbb8d657afd874_GL0.tar.gz) = fc0892141f241af9eb63e8fab65137948f5bb8fa5670b86ff87d9d82eb57fa12
-SIZE (gitlab-org-gitlab-pages-4e11c8392935e1f4dbd96066f3cbb8d657afd874_GL0.tar.gz) = 1076893
+TIMESTAMP = 1526695044
+SHA256 (gitlab-org-gitlab-pages-69b7e196fe0336c91a44da72110f44c2ec0869b0_GL0.tar.gz) = d993cb8c584d0366837e723f29bee9a3fb67ea0044448f185dc6cec255ff1f39
+SIZE (gitlab-org-gitlab-pages-69b7e196fe0336c91a44da72110f44c2ec0869b0_GL0.tar.gz) = 1692719
Modified: branches/2018Q2/www/gitlab-pages/files/gitlab_pages.in
==============================================================================
--- branches/2018Q2/www/gitlab-pages/files/gitlab_pages.in Tue Jun 5 20:06:10 2018 (r471816)
+++ branches/2018Q2/www/gitlab-pages/files/gitlab_pages.in Tue Jun 5 20:16:46 2018 (r471817)
@@ -17,6 +17,8 @@
# Set it to user to run gitlab_pages under
# gitlab_pages_group (str): Set to "gitlab-pages" by default.
# Set it to group to run gitlab-pages under
+# gitlab_pages_logfile (str): Set to "/var/log/gitlab_pages.log" by default.
+# Set it to file to send gitlab-pages logs to
#
. /etc/rc.subr
@@ -30,28 +32,30 @@ load_rc_config $name
: ${gitlab_pages_dir:="/var/tmp/gitlab_pages"}
: ${gitlab_pages_user:="gitlab-pages"}
: ${gitlab_pages_group:="gitlab-pages"}
+: ${gitlab_pages_logfile:="/var/log/gitlab_pages.log"}
export HOME=${gitlab_pages_dir}
export PATH=${PATH}:%%PREFIX%%/bin
pidfile="/var/run/${name}.pid"
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} %%PREFIX%%/bin/gitlab-pages run"
gitlab_pages_chdir="${gitlab_pages_dir}"
procname=%%PREFIX%%/bin/gitlab-pages
start_precmd="gitlab_pages_startprecmd"
+start_cmd="gitlab_pages_startcmd"
list_cmd="listfunc"
register_cmd="registerfunc"
listfunc()
{
+ cd ${gitlab_pages_chdir} ; \
su -m ${gitlab_pages_user} -c "env HOME=${gitlab_pages_dir} %%PREFIX%%/bin/gitlab-pages list"
}
registerfunc()
{
+ cd ${gitlab_pages_chdir} ; \
su -m ${gitlab_pages_user} -c "env HOME=${gitlab_pages_dir} %%PREFIX%%/bin/gitlab-pages register"
}
@@ -63,6 +67,12 @@ gitlab_pages_startprecmd()
if [ ! -d "${gitlab_pages_dir}" ]; then
install -d -o "${gitlab_pages_user}" -g "${gitlab_pages_group}" "${gitlab_pages_dir}"
fi
+}
+
+gitlab_pages_startcmd()
+{
+ cd ${gitlab_pages_chdir} ; \
+ daemon -u ${gitlab_pages_user} -p ${pidfile} /usr/local/bin/gitlab-pages ${gitlab_pages_args} run < /dev/null >> ${gitlab_pages_logfile} 2>> ${gitlab_pages_logfile}
}
extra_commands="list register"
Copied: branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__fileno.go (from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__fileno.go)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__fileno.go Tue Jun 5 20:16:46 2018 (r471817, copy of r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__fileno.go)
@@ -0,0 +1,12 @@
+--- vendor/github.com/karrick/godirwalk/dirent_fileno.go.orig 2018-05-19 02:10:07 UTC
++++ vendor/github.com/karrick/godirwalk/dirent_fileno.go
+@@ -0,0 +1,9 @@
++// +build dragonfly freebsd openbsd netbsd
++
++package godirwalk
++
++import "syscall"
++
++func direntIno(de *syscall.Dirent) uint64 {
++ return uint64(de.Fileno)
++}
Copied: branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__ino.go (from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__ino.go)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__ino.go Tue Jun 5 20:16:46 2018 (r471817, copy of r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_dirent__ino.go)
@@ -0,0 +1,12 @@
+--- vendor/github.com/karrick/godirwalk/dirent_ino.go.orig 2018-05-19 02:10:07 UTC
++++ vendor/github.com/karrick/godirwalk/dirent_ino.go
+@@ -0,0 +1,9 @@
++// +build darwin linux
++
++package godirwalk
++
++import "syscall"
++
++func direntIno(de *syscall.Dirent) uint64 {
++ return de.Ino
++}
Copied: branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir.go (from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir.go)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir.go Tue Jun 5 20:16:46 2018 (r471817, copy of r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir.go)
@@ -0,0 +1,46 @@
+--- vendor/github.com/karrick/godirwalk/readdir.go.orig 2018-04-30 10:37:07 UTC
++++ vendor/github.com/karrick/godirwalk/readdir.go
+@@ -2,6 +2,9 @@ package godirwalk
+
+ import (
+ "os"
++ "path/filepath"
++
++ "github.com/pkg/errors"
+ )
+
+ // Dirent stores the name and file system mode type of discovered file system
+@@ -11,6 +14,22 @@ type Dirent struct {
+ modeType os.FileMode
+ }
+
++// NewDirent returns a newly initialized Dirent structure, or an error. This
++// function does not follow symbolic links.
++//
++// This function is rarely used, as Dirent structures are provided by other
++// functions in this library that read and walk directories.
++func NewDirent(osPathname string) (*Dirent, error) {
++ fi, err := os.Lstat(osPathname)
++ if err != nil {
++ return nil, errors.Wrap(err, "cannot lstat")
++ }
++ return &Dirent{
++ name: filepath.Base(osPathname),
++ modeType: fi.Mode() & os.ModeType,
++ }, nil
++}
++
+ // Name returns the basename of the file system entry.
+ func (de Dirent) Name() string { return de.name }
+
+@@ -28,6 +47,10 @@ func (de Dirent) ModeType() os.FileMode { return de.mo
+ // may be set for a node. For instance, on Windows, a symbolic link that points
+ // to a directory will have both the directory and the symbolic link bits set.
+ func (de Dirent) IsDir() bool { return de.modeType&os.ModeDir != 0 }
++
++// IsRegular returns true if and only if the Dirent represents a regular
++// file. That is, it ensures that no mode type bits are set.
++func (de Dirent) IsRegular() bool { return de.modeType&os.ModeType == 0 }
+
+ // IsSymlink returns true if and only if the Dirent represents a file system
+ // symbolic link. Note that on some operating systems, more than one file mode
Copied: branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir__unix.go (from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir__unix.go)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir__unix.go Tue Jun 5 20:16:46 2018 (r471817, copy of r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_readdir__unix.go)
@@ -0,0 +1,17 @@
+--- vendor/github.com/karrick/godirwalk/readdir_unix.go.orig 2018-04-30 10:37:07 UTC
++++ vendor/github.com/karrick/godirwalk/readdir_unix.go
+@@ -1,4 +1,4 @@
+-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
++// +build darwin freebsd linux netbsd openbsd
+
+ package godirwalk
+
+@@ -49,7 +49,7 @@ func readdirents(osDirname string, scratchBuffer []byt
+ de = (*syscall.Dirent)(unsafe.Pointer(&buf[0])) // point entry to first syscall.Dirent in buffer
+ buf = buf[de.Reclen:] // advance buffer
+
+- if de.Ino == 0 {
++ if direntIno(de) == 0 {
+ continue // this item has been deleted, but not yet removed from directory
+ }
+
Copied: branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_walk.go (from r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_walk.go)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2018Q2/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_walk.go Tue Jun 5 20:16:46 2018 (r471817, copy of r470353, head/www/gitlab-pages/files/patch-vendor_github.com_karrick_godirwalk_walk.go)
@@ -0,0 +1,13 @@
+--- vendor/github.com/karrick/godirwalk/walk.go.orig 2018-04-30 10:37:07 UTC
++++ vendor/github.com/karrick/godirwalk/walk.go
+@@ -188,6 +188,10 @@ func Walk(pathname string, options *Options) error {
+ options.ErrorCallback = defaultErrorCallback
+ }
+
++ if options.ScratchBuffer == nil {
++ options.ScratchBuffer = make([]byte, 64*1024)
++ }
++
+ err = walk(pathname, dirent, options)
+ if err == filepath.SkipDir {
+ return nil // silence SkipDir for top level
More information about the svn-ports-all
mailing list