Attachment 189288 Details for Bug 224614 – patch file

[patch] patch file

gogs-0.11.34_2.patch (text/plain), 3.16 KB, created by Dmitri Goutnik on 2017-12-31 13:17:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2017-12-31 13:17:46 UTC

Size: 3.16 KB

patch

obsolete

>Index: devel/gogs/Makefile
>===================================================================
>--- devel/gogs/Makefile	(revision 457686)
>+++ devel/gogs/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> PORTNAME=	gogs
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.11.34
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel www
> 
> MAINTAINER=	dg@syrec.org
>Index: devel/gogs/files/gogs-service.in
>===================================================================
>--- devel/gogs/files/gogs-service.in	(revision 457686)
>+++ devel/gogs/files/gogs-service.in	(working copy)
>@@ -26,20 +26,17 @@
> : ${%%PORTNAME%%_enable="NO"}
> : ${%%PORTNAME%%_config="%%ETCDIR%%/conf/app.ini"}
> 
>+logfile=/var/log/%%PORTNAME%%.log
>+pidfile=/var/run/%%PORTNAME%%.pid
>+command="/usr/bin/true"
>+procname="/usr/sbin/daemon"
>+
> is_process_running() {
>-  local pidfile=$1
>-  [ -f $pidfile ] && procstat `cat $pidfile` >/dev/null 2>&1
>+  [ -f $pidfile ] && procstat $(cat $pidfile) >/dev/null 2>&1
> }
> 
>-stop_daemon() {
>-  # assume PID is also PGID (daemon(8) PID is always PGID)
>-  [ -f "$1" ] && kill -- -$(cat $1)
>-}
>-
> %%PORTNAME%%_start() {
>-  local logfile=/var/log/%%PORTNAME%%.log
>-  local pidfile=/var/run/%%PORTNAME%%.pid
>-  if is_process_running $pidfile; then
>+  if is_process_running; then
>     echo "%%PORTNAME%% is already running (pid=$(cat $pidfile))"
>     return 1
>   fi
>@@ -49,7 +46,7 @@
>   chmod 640 $logfile
>   cd %%PREFIX%%/libexec/%%PORTNAME%%
>   /usr/sbin/daemon -P $pidfile -u %%GOGS_USER%% %%PREFIX%%/libexec/%%PORTNAME%%/%%PORTNAME%% web --config ${%%PORTNAME%%_config} >>$logfile 2>&1
>-  if is_process_running $pidfile; then
>+  if is_process_running; then
>     echo "started %%PORTNAME%% (pid=$(cat $pidfile))"
>   else
>     echo "failed to start %%PORTNAME%%"
>@@ -57,15 +54,13 @@
> }
> 
> %%PORTNAME%%_stop() {
>-  local pidfile=/var/run/%%PORTNAME%%.pid
>-  if is_process_running $pidfile; then
>-    echo "stopping %%PORTNAME%% (pid=$(cat $pidfile))"
>-    stop_daemon $pidfile
>+  if is_process_running; then
>+    local pid=$(cat $pidfile)
>+    echo "stopping %%PORTNAME%% (pid=$pid)"
>+    kill -- -$pid
>   else
>     echo "%%PORTNAME%% isn't running"
>   fi
> }
> 
>-command="/usr/bin/true"
>-
> run_rc_command "$1"
>Index: devel/gogs/files/patch-routes_repo_commit.go
>===================================================================
>--- devel/gogs/files/patch-routes_repo_commit.go	(nonexistent)
>+++ devel/gogs/files/patch-routes_repo_commit.go	(working copy)
>@@ -0,0 +1,10 @@
>+--- routes/repo/commit.go.orig	2017-12-31 13:07:52 UTC
>++++ routes/repo/commit.go
>+@@ -45,6 +44,7 @@ func RenderIssueLinks(oldCommits *list.L
>+ func renderCommits(c *context.Context, filename string) {
>+ 	c.Data["Title"] = c.Tr("repo.commits.commit_history") + " Â· " + c.Repo.Repository.FullName()
>+ 	c.Data["PageIsCommits"] = true
>++	c.Data["FileName"] = filename
>+ 
>+ 	page := c.QueryInt("page")
>+ 	if page < 1 {
>
>Property changes on: devel/gogs/files/patch-routes_repo_commit.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

Flags:

dmgk: maintainer-approval+

Actions: View | Diff

Attachments on bug 224614: 189128 | 189288