Index: head/devel/gitlab-runner/Makefile =================================================================== --- head/devel/gitlab-runner/Makefile (revision 449978) +++ head/devel/gitlab-runner/Makefile (revision 449979) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= gitlab-runner -PORTVERSION= 9.3.0 +PORTVERSION= 9.5.0 CATEGORIES= devel MASTER_SITES= \ https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.bz2?ref=v${PORTVERSION}&dummy=/ \ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm DISTFILES= \ ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ prebuilt-x86_64.tar.xz:dockerx64 \ prebuilt-arm.tar.xz:dockerarm DIST_SUBDIR= gitlab-runner EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= swills@FreeBSD.org COMMENT= Official GitLab Runner written in Go BUILD_DEPENDS= go:lang/go \ go-bindata:devel/go-bindata RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ bash:shells/bash \ git:devel/git USES= tar:bz2 -GITHASH= 3df822b2c6e3b083986002bb9f012599bd74f6e9 -GITREV= 3df822b -GITBRANCH= 9-3-stable +GITHASH= 413da38a72634601bf435f6215d6669cd5a4e40e +GITREV= 413da38 +GITBRANCH= 9-5-stable WRKSRC= ${WRKDIR}/gitlab-ci-multi-runner-v${PORTVERSION}-${GITHASH} PLIST_FILES= bin/gitlab-runner USE_RC_SUBR= gitlab_runner USERS= gitlab-runner GROUPS= gitlab-runner post-extract: @${MKDIR} ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/ post-patch: @${REINPLACE_CMD} \ -e "s!%%VERSION%%!${PORTVERSION}!g" \ -e "s!%%REVISION%%!${GITREV}!g" \ -e "s!%%BRANCH%%!${GITBRANCH}!g" \ ${WRKSRC}/common/version.go do-build: @cd ${WRKSRC} && go-bindata \ -pkg docker \ -nocompress \ -nomemcopy \ -nometadata \ -prefix out/docker/ \ -o executors/docker/bindata.go \ out/docker/prebuilt-x86_64.tar.xz \ out/docker/prebuilt-arm.tar.xz @cd ${WRKSRC} && go fmt executors/docker/bindata.go @${MV} ${WRKSRC}/vendor ${WRKSRC}/src @${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org @${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner @cd ${WRKSRC} && ${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build -o gitlab-ci-multi-runner do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gitlab-ci-multi-runner ${STAGEDIR}${PREFIX}/bin/gitlab-runner .include Index: head/devel/gitlab-runner/distinfo =================================================================== --- head/devel/gitlab-runner/distinfo (revision 449978) +++ head/devel/gitlab-runner/distinfo (revision 449979) @@ -1,7 +1,7 @@ -TIMESTAMP = 1500583645 -SHA256 (gitlab-runner/gitlab-runner-9.3.0.tar.bz2) = c888f4a406bbb1b6013e2aed040593d209030aeec99c926d55ae20317ec1994f -SIZE (gitlab-runner/gitlab-runner-9.3.0.tar.bz2) = 2211320 +TIMESTAMP = 1505611321 +SHA256 (gitlab-runner/gitlab-runner-9.5.0.tar.bz2) = 6de3f169534d95f9778f9f0f4f22318a582113bb1948b99857fd9dad6a3b8934 +SIZE (gitlab-runner/gitlab-runner-9.5.0.tar.bz2) = 2499170 SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = 84b34f511ac2294a13e61aa3f0c8b1db2f450d610c72dc3b84f5c865355ef154 SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 11106288 SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = 874e101bfa996b2ed4460a930429277f6eeaeb6d3f9fbcb962452b259be56f26 SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 9088532 Index: head/devel/gitlab-runner/files/gitlab_runner.in =================================================================== --- head/devel/gitlab-runner/files/gitlab_runner.in (revision 449978) +++ head/devel/gitlab-runner/files/gitlab_runner.in (revision 449979) @@ -1,66 +1,69 @@ #!/bin/sh # PROVIDE: gitlab_runner # REQUIRE: DAEMON NETWORKING # KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable gitlab_runner: # # gitlab_runner_enable (bool): Set to "NO" by default. # Set it to "YES" to enable gitlab-runner # gitlab_runner_dir (str): Set to "/var/tmp/gitlab_runner" by default. # Set it to directory to run gitlab-runner in # gitlab_runner_user (str): Set to "gitlab-runner" by default. # Set it to user to run gitlab_runner under # gitlab_runner_group (str): Set to "gitlab-runner" by default. # Set it to group to run gitlab-runner under +# gitlab_runner_syslogtag (str):Set to "gitlab-runner" by default. +# Set it to tag to be used by syslog # . /etc/rc.subr name="gitlab_runner" rcvar="gitlab_runner_enable" load_rc_config $name : ${gitlab_runner_enable:="NO"} : ${gitlab_runner_dir:="/var/tmp/gitlab_runner"} : ${gitlab_runner_user:="gitlab-runner"} : ${gitlab_runner_group:="gitlab-runner"} +: ${gitlab_runner_syslogtag:="gitlab-runner"} export HOME=${gitlab_runner_dir} export PATH=${PATH}:%%PREFIX%%/bin pidfile="/var/run/${name}.pid" command="/usr/sbin/daemon" -command_args="-f -p ${pidfile} %%PREFIX%%/bin/gitlab-runner run" +command_args="-f -p ${pidfile} %%PREFIX%%/bin/gitlab-runner run --syslog --service ${gitlab_runner_syslogtag}" gitlab_runner_chdir="${gitlab_runner_dir}" procname=%%PREFIX%%/bin/gitlab-runner start_precmd="gitlab_runner_startprecmd" list_cmd="listfunc" register_cmd="registerfunc" listfunc() { su -m ${gitlab_runner_user} -c "env HOME=${gitlab_runner_dir} %%PREFIX%%/bin/gitlab-runner list" } registerfunc() { su -m ${gitlab_runner_user} -c "env HOME=${gitlab_runner_dir} %%PREFIX%%/bin/gitlab-runner register" } gitlab_runner_startprecmd() { if [ ! -e "${pidfile}" ]; then install -g ${gitlab_runner_group} -o ${gitlab_runner_user} -- /dev/null "${pidfile}"; fi if [ ! -d "${gitlab_runner_dir}" ]; then install -d -o "${gitlab_runner_user}" -g "${gitlab_runner_group}" "${gitlab_runner_dir}" fi } extra_commands="list register" run_rc_command $1 Index: head/devel/gitlab-runner/files/patch-helpers_service_simple.go =================================================================== --- head/devel/gitlab-runner/files/patch-helpers_service_simple.go (nonexistent) +++ head/devel/gitlab-runner/files/patch-helpers_service_simple.go (revision 449979) @@ -0,0 +1,66 @@ +--- helpers/service/simple.go.orig 2017-06-22 10:21:35 UTC ++++ helpers/service/simple.go +@@ -6,6 +6,8 @@ import ( + "os" + "os/signal" + "syscall" ++ "fmt" ++ "log/syslog" + ) + + var ( +@@ -18,6 +20,39 @@ type SimpleService struct { + c *service.Config + } + ++// Begin copy from /vendor/github.com/ayufan/golang-kardianos-service/service_unix.go ++type sysLogger struct { ++ *syslog.Writer ++ errs chan<- error ++} ++ ++func (s sysLogger) send(err error) error { ++ if err != nil && s.errs != nil { ++ s.errs <- err ++ } ++ return err ++} ++ ++func (s sysLogger) Error(v ...interface{}) error { ++ return s.send(s.Writer.Err(fmt.Sprint(v...))) ++} ++func (s sysLogger) Warning(v ...interface{}) error { ++ return s.send(s.Writer.Warning(fmt.Sprint(v...))) ++} ++func (s sysLogger) Info(v ...interface{}) error { ++ return s.send(s.Writer.Info(fmt.Sprint(v...))) ++} ++func (s sysLogger) Errorf(format string, a ...interface{}) error { ++ return s.send(s.Writer.Err(fmt.Sprintf(format, a...))) ++} ++func (s sysLogger) Warningf(format string, a ...interface{}) error { ++ return s.send(s.Writer.Warning(fmt.Sprintf(format, a...))) ++} ++func (s sysLogger) Infof(format string, a ...interface{}) error { ++ return s.send(s.Writer.Info(fmt.Sprintf(format, a...))) ++} ++// End copy ++ + // Run should be called shortly after the program entry point. + // After Interface.Stop has finished running, Run will stop blocking. + // After Run stops blocking, the program must exit shortly after. +@@ -79,7 +114,13 @@ func (s *SimpleService) Logger(errs chan<- error) (ser + // SystemLogger opens and returns a system logger. If errs is non-nil errors + // will be sent on errs as well as returned from Logger's functions. + func (s *SimpleService) SystemLogger(errs chan<- error) (service.Logger, error) { +- return nil, ErrNotSupported ++ // Begin copy from vendor/github.com/ayufan/golang-kardianos-service/service_unix.go ++ w, err := syslog.New(syslog.LOG_INFO, s.c.Name) ++ if err != nil { ++ return nil, err ++ } ++ return sysLogger{w, errs}, nil ++ // End copy + } + + // String displays the name of the service. The display name if present, Property changes on: head/devel/gitlab-runner/files/patch-helpers_service_simple.go ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property