Attachment 202040 Details for Bug 235758 – sks-usr-rc.diff

[patch] sks-usr-rc.diff

sks-user-rc.diff (text/plain), 4.71 KB, created by Michiel van Baak Jansen on 2019-02-15 14:24:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michiel van Baak Jansen

Created: 2019-02-15 14:24:32 UTC

Size: 4.71 KB

patch

obsolete

>Index: UIDs
>===================================================================
>--- UIDs	(revision 492992)
>+++ UIDs	(working copy)
>@@ -549,7 +549,7 @@
> _tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin
> _pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin
> _acme:*:603:603::0:0:ACME client user:/var/empty:/usr/sbin/nologin
>-# free: 604
>+_sks:*:604:604::0:0:sks-keyserver user:/var/empty:/usr/sbin/nologin
> # free: 605
> # free: 606
> # free: 607
>Index: GIDs
>===================================================================
>--- GIDs	(revision 492992)
>+++ GIDs	(working copy)
>@@ -544,7 +544,7 @@
> _tss:*:601:
> _pkcs11:*:602:
> _acme:*:603:
>-# free: 604
>+_sks:*:604:
> # free: 605
> # free: 606
> # free: 607
>Index: security/sks/Makefile
>===================================================================
>--- security/sks/Makefile	(revision 492992)
>+++ security/sks/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	sks
> PORTVERSION=	1.1.6
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
> 
>@@ -10,10 +11,11 @@
> 
> LICENSE=	GPLv2+
> 
>+USES=		bdb:5 perl5 gmake shebangfix tar:tgz
> USE_OCAML=	yes
> USE_OCAML_CAMLP4=yes
>-USES=		bdb:5 perl5 gmake shebangfix tar:tgz
> USE_PERL5=	build
>+
> MAKE_JOBS_UNSAFE=yes
> SHEBANG_FILES=	sks_build.sh
> 
>@@ -24,6 +26,12 @@
> 
> SUB_FILES=	pkg-message
> 
>+USE_RC_SUBR=	sks-db sks-recon
>+PORTDOCS=	BUGS README.md TODO UPGRADING
>+
>+USERS=		_sks
>+GROUPS=		_sks
>+
> OPTIONS_DEFINE=	DOCS
> 
> post-extract:
>@@ -40,10 +48,11 @@
> pre-build:
> 	@cd ${WRKSRC} && test -f .depend || ${MAKE_CMD} dep
> 
>+post-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>+
> post-install:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC} && ${INSTALL_DATA} BUGS README.md TODO UPGRADING \
>-		 ${STAGEDIR}${DOCSDIR}
> 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} sks sks_add_mail
> 
> .include <bsd.port.mk>
>Index: security/sks/files/sks-db.in
>===================================================================
>--- security/sks/files/sks-db.in	(nonexistent)
>+++ security/sks/files/sks-db.in	(working copy)
>@@ -0,0 +1,40 @@
>+#!/bin/sh
>+# Created by: Michiel van Baak <michiel@vanbaak.eu>
>+#
>+# $FreeBSD$
>+#
>+# PROVIDE: sks-db
>+# REQUIRE: DAEMON
>+# BEFORE: sks-recon
>+
>+. /etc/rc.subr
>+
>+name="sks_db"
>+rcvar=sks_db_enable
>+load_rc_config $name
>+
>+: ${sks_db_enable:=NO}
>+: ${sks_db_user="_sks"}
>+: ${sks_db_group="_sks"}
>+: ${sks_db_datadir="/var/db/sks"}
>+: ${sks_db_recover_onstart=NO}
>+
>+command="/usr/local/bin/sks"
>+command_args="-basedir ${sks_db_datadir} db"
>+pidfile="/var/run/sks-db.pid"
>+
>+start_precmd=sks_db_prestart
>+start_cmd="/usr/sbin/daemon -f -p ${pidfile} -u ${sks_db_user} ${command} ${command_args}"
>+
>+sks_db_prestart()
>+{
>+	install -d -o ${sks_db_user} -g ${sks_db_group} ${sks_db_datadir}
>+	install -d -o ${sks_db_user} -g ${sks_db_group} ${sks_db_datadir}/KDB
>+
>+	if checkyesno sks_db_recover_onstart
>+	then
>+		/usr/local/bin/db_recover-5 -h ${sqs_db_datadir}/KDB/
>+	fi
>+}
>+
>+run_rc_command "$1"
>
>Property changes on: security/sks/files/sks-db.in
>___________________________________________________________________
>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
>Index: security/sks/files/sks-recon.in
>===================================================================
>--- security/sks/files/sks-recon.in	(nonexistent)
>+++ security/sks/files/sks-recon.in	(working copy)
>@@ -0,0 +1,26 @@
>+#!/bin/sh
>+# Created by: Michiel van Baak <michiel@vanbaak.eu>
>+#
>+# $FreeBSD$
>+#
>+# PROVIDE: sks-recon
>+# REQUIRE: DAEMON sks-db
>+
>+. /etc/rc.subr
>+
>+name="sks_recon"
>+rcvar=sks_recon_enable
>+load_rc_config $name
>+
>+: ${sks_recon_enable:=NO}
>+: ${sks_recon_user="_sks"}
>+: ${sks_recon_group="_sks"}
>+: ${sks_recon_datadir="/var/db/sks"}
>+
>+command="/usr/local/bin/sks"
>+command_args="-basedir ${sks_recon_datadir} recon"
>+pidfile="/var/run/sks-recon.pid"
>+
>+start_cmd="/usr/sbin/daemon -f -p ${pidfile} -u ${sks_recon_user} ${command} ${command_args}"
>+
>+run_rc_command "$1"
>
>Property changes on: security/sks/files/sks-recon.in
>___________________________________________________________________
>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
>Index: security/sks/pkg-plist
>===================================================================
>--- security/sks/pkg-plist	(revision 492992)
>+++ security/sks/pkg-plist	(working copy)
>@@ -2,7 +2,3 @@
> bin/sks_add_mail
> bin/sks_build.sh
> man/man8/sks.8.gz
>-%%PORTDOCS%%%%DOCSDIR%%/BUGS
>-%%PORTDOCS%%%%DOCSDIR%%/README.md
>-%%PORTDOCS%%%%DOCSDIR%%/TODO
>-%%PORTDOCS%%%%DOCSDIR%%/UPGRADING

Actions: View | Diff

Attachments on bug 235758: 202039 | 202040