CVS commit: pkgsrc/www/gitea

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Thu Nov 18 02:45:29 UTC 2021

Modified Files:
        pkgsrc/www/gitea: Makefile
        pkgsrc/www/gitea/files: app.ini.sample gitea.sh

Log Message:
gitea: let the RC script work unprivileged

This takes advantage of the introduction of the SYSCONFBASE variable.
Tested on NetBSD/amd64.

While there, also fix a couple substitutions in the default configuration file
(app.ini).

Bumps PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/www/gitea/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/gitea/files/app.ini.sample
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/gitea/files/gitea.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/gitea/Makefile
diff -u pkgsrc/www/gitea/Makefile:1.60 pkgsrc/www/gitea/Makefile:1.61
--- pkgsrc/www/gitea/Makefile:1.60      Fri Nov  5 20:02:49 2021
+++ pkgsrc/www/gitea/Makefile   Thu Nov 18 02:45:29 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2021/11/05 20:02:49 bsiegert Exp $
+# $NetBSD: Makefile,v 1.61 2021/11/18 02:45:29 khorben Exp $
 
 DISTNAME=      gitea-1.13.4
-PKGREVISION=   10
+PKGREVISION=   11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=go-gitea/}
 CATEGORIES=    www
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -74,7 +74,7 @@ SUBST_CLASSES+=               fix-var
 SUBST_STAGE.fix-var=   pre-configure
 SUBST_MESSAGE.fix-var= Replace some vars
 SUBST_FILES.fix-var=   ${WRKDIR}/app.ini.sample
-SUBST_VARS.fix-var=    VARBASE GITEA_USER
+SUBST_VARS.fix-var=    PKG_SYSCONFDIR VARBASE GITEA_USER
 
 CONF_FILES_PERMS+=     ${EGDIR}/app.ini.sample ${PKG_SYSCONFDIR}/conf/app.ini \
                        ${GITEA_USER} ${GITEA_GROUP} 0600

Index: pkgsrc/www/gitea/files/app.ini.sample
diff -u pkgsrc/www/gitea/files/app.ini.sample:1.1 pkgsrc/www/gitea/files/app.ini.sample:1.2
--- pkgsrc/www/gitea/files/app.ini.sample:1.1   Sun Mar 24 21:34:23 2019
+++ pkgsrc/www/gitea/files/app.ini.sample       Thu Nov 18 02:45:29 2021
@@ -17,7 +17,7 @@
 # localhost.
 #
 # If you'd rather use the web-based installer, remove this conf/app.ini file
-# and make %%PREFIX%%/etc/gitea/conf writeable to the git user.
+# and make @PKG_SYSCONFDIR@/gitea/conf writeable to the @GITEA_USER@ user.
 
 APP_NAME = Gitea: Git with a cup of tea
 RUN_USER = @GITEA_USER@

Index: pkgsrc/www/gitea/files/gitea.sh
diff -u pkgsrc/www/gitea/files/gitea.sh:1.3 pkgsrc/www/gitea/files/gitea.sh:1.4
--- pkgsrc/www/gitea/files/gitea.sh:1.3 Mon Mar  1 23:47:09 2021
+++ pkgsrc/www/gitea/files/gitea.sh     Thu Nov 18 02:45:29 2021
@@ -1,11 +1,15 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: gitea.sh,v 1.3 2021/03/01 23:47:09 khorben Exp $
+# $NetBSD: gitea.sh,v 1.4 2021/11/18 02:45:29 khorben Exp $
 #
 # PROVIDE: gitea
 # REQUIRE: DAEMON
+#
+# You will need to set some variables in @SYSCONFBASE@/rc.conf to start gitea:
+#
+# gitea=YES
 
-. /etc/rc.subr
+$_rc_subr_loaded . @SYSCONFBASE@/rc.subr
 
 name="gitea"
 rcvar=${name}