Attachment 179991 Details for Bug 217083 – v4 patch with indents and rc.conf

[patch] v4 patch with indents and rc.conf

2f0cf402dec36704c0c13b7b275b93da8038253d.patch (text/plain), 4.73 KB, created by Dave Cottlehuber on 2017-02-14 17:54:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Cottlehuber

Created: 2017-02-14 17:54:27 UTC

Size: 4.73 KB

patch

obsolete

>From 2f0cf402dec36704c0c13b7b275b93da8038253d Mon Sep 17 00:00:00 2001
>From: Dave Cottlehuber <dch@skunkwerks.at>
>Date: Mon, 13 Feb 2017 20:07:16 +0000
>Subject: [PATCH] databases/kyototycoon: add rc.d script and daemon account
>
>---
> GIDs                                       |  2 +-
> UIDs                                       |  2 +-
> databases/kyototycoon/Makefile             | 31 ++++++++++++++++-
> databases/kyototycoon/files/kyototycoon.in | 55 ++++++++++++++++++++++++++++++
> 4 files changed, 87 insertions(+), 3 deletions(-)
> create mode 100644 databases/kyototycoon/files/kyototycoon.in
>
>diff --git a/GIDs b/GIDs
>index e00afa2..aeda437 100644
>--- a/GIDs
>+++ b/GIDs
>@@ -155,7 +155,7 @@ shoutcast:*:210:
> git:*:211:
> hg:*:212:
> drizzle:*:213:
>-# free: 214
>+kyototycoon:*:214:
> opendnssec:*:215:
> nsd:*:216:
> # free: 217
>diff --git a/UIDs b/UIDs
>index f17ae2f..407588d 100644
>--- a/UIDs
>+++ b/UIDs
>@@ -160,7 +160,7 @@ shoutcast:*:210:210::0:0:Shoutcast sandbox:/nonexistent:/bin/sh
> git:*:211:211::0:0:gitosis user:/usr/local/git:/bin/sh
> hg:*:212:212::0:0:mercurial-server user:/usr/local/hg:/bin/sh
> drizzle:*:213:213::0:0:Drizzle daemon:/var/db/drizzle:/usr/sbin/nologin
>-# free: 214
>+kyototycoon:*:214:214::0:0:kyototycoon user:/var/empty:/usr/sbin/nologin
> opendnssec:*:215:215::0:0:Opendnssec Pseudo User:/nonexistent:/usr/sbin/nologin
> nsd:*:216:216::0:0:NSD DNS Server:/nonexistent:/usr/sbin/nologin
> # free: 217
>diff --git a/databases/kyototycoon/Makefile b/databases/kyototycoon/Makefile
>index 43f4db8..e62ec58b 100644
>--- a/databases/kyototycoon/Makefile
>+++ b/databases/kyototycoon/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	kyototycoon
> PORTVERSION=	0.9.56
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	databases
> MASTER_SITES=	http://fallabs.com/${PORTNAME}/pkg/ \
> 		LOCAL/sunpoet
>@@ -18,6 +18,8 @@ LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
> 
> OPTIONS_DEFINE=	DOCS LZO
> 
>+USE_RC_SUBR=	${PORTNAME}
>+
> CONFIGURE_ARGS=	--enable-uyield
> CPPFLAGS+=	-fPIC
> GNU_CONFIGURE=	yes
>@@ -28,6 +30,33 @@ TEST_TARGET=	check
> USE_LDCONFIG=	yes
> USES=		gmake pkgconfig
> 
>+SUB_FILES=	${PORTNAME}
>+SUB_LIST+=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
>+			KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
>+			KYOTOTYCOON_PIDFILE=${KYOTOTYCOON_PIDFILE} \
>+			KYOTOTYCOON_DBDIR=${KYOTOTYCOON_DBDIR} \
>+			KYOTOTYCOON_LOGDIR=${KYOTOTYCOON_LOGDIR}
>+
>+PLIST_SUB=	KYOTOTYCOON_USER=${KYOTOTYCOON_USER} \
>+			KYOTOTYCOON_GROUP=${KYOTOTYCOON_GROUP} \
>+			KYOTOTYCOON_PIDFILE=${KYOTOTYCOON_PIDFILE} \
>+			KYOTOTYCOON_DBDIR=${KYOTOTYCOON_DBDIR} \
>+			KYOTOTYCOON_LOGDIR=${KYOTOTYCOON_LOGDIR}
>+
>+KYOTOTYCOON_USER?=	${PORTNAME}
>+KYOTOTYCOON_GROUP?=	${PORTNAME}
>+
>+.if ${KYOTOTYCOON_USER} == "${PORTNAME}"
>+USERS=	${PORTNAME}
>+.endif
>+.if ${KYOTOTYCOON_GROUP} == "${PORTNAME}"
>+GROUPS=	${PORTNAME}
>+.endif
>+
>+KYOTOTYCOON_LOGDIR=	/var/log/${PORTNAME}
>+KYOTOTYCOON_DBDIR=	/var/db/${PORTNAME}
>+KYOTOTYCOON_PIDFILE=	/var/run/${PORTNAME}.pid
>+
> PORTDOCS=	*
> 
> LZO_CONFIGURE_OFF=	ac_cv_lib_lzo2_main=no
>diff --git a/databases/kyototycoon/files/kyototycoon.in b/databases/kyototycoon/files/kyototycoon.in
>new file mode 100644
>index 0000000..7719f64
>--- /dev/null
>+++ b/databases/kyototycoon/files/kyototycoon.in
>@@ -0,0 +1,55 @@
>+#!/bin/sh
>+
>+# $FreeBSD$
>+#
>+# PROVIDE: kyototycoon
>+# REQUIRE: LOGIN NETWORKING SERVERS
>+# KEYWORD: shutdown
>+#
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>+# to enable this service:
>+#
>+# kyototycoon_enable    (bool):   Set to NO by default.
>+# Set it to YES to enable kyototycoon.
>+#
>+# kyototycoon_user      (user):   Set to kyototycoon by default.
>+# kyototycoon_group     (group):  Set to kyototycoon by default.
>+# kyototycoon_log       (path):   Path to log file.
>+# kyototycoon_dbdir     (path):   Path to database files.
>+# kyototycoon_sid       (int):    ServerID - 0-65535
>+# kyototycoon_opts      (args):   Additional command-line arguments.
>+. /etc/rc.subr
>+
>+name="kyototycoon"
>+rcvar=kyototycoon_enable
>+
>+load_rc_config $name
>+
>+: ${kyototycoon_enable="NO"}
>+: ${kyototycoon_user:="%%KYOTOTYCOON_USER%%"}
>+: ${kyototycoon_group:="%%KYOTOTYCOON_GROUP%%"}
>+: ${kyototycoon_log="%%KYOTOTYCOON_LOGDIR%%/kyoto.log"}
>+: ${kyototycoon_dbdir="%%KYOTOTYCOON_DBDIR%%"}
>+: ${kyototycoon_sid="1"}
>+: ${kyototycoon_opts:=" -li"}
>+
>+pidfile="%%KYOTOTYCOON_PIDFILE%%"
>+command="/usr/sbin/daemon"
>+command_args="-f -c -r -t ${name} -P ${pidfile} \
>+    %%PREFIX%%/bin/ktserver \
>+    -sid ${kyototycoon_sid} \
>+    -log ${kyototycoon_log} \
>+    -bgs ${kyototycoon_dbdir}/snapshots \
>+    -ulog ${kyototycoon_dbdir}/updates \
>+    ${kyototycoon_opts}"
>+
>+required_dirs="${kyototycoon_dbdir}/snapshots ${kyototycoon_dbdir}/updates"
>+required_files="${kyototycoon_log}"
>+
>+kyototycoon_prestart()
>+{
>+    install -o ${kyototycoon_user} /dev/null ${pidfile}
>+}
>+start_precmd=${name}_prestart
>+
>+run_rc_command "$1"

Actions: View | Diff

Attachments on bug 217083: 179960 | 179961 | 179988 | 179991