Attachment #202040 for bug #235758

Lines 549-555 Link Here

(-)UIDs (-1 / +1 lines)
549	_tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin	549	_tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin
550	_pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin	550	_pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin
551	_acme:*:603:603::0:0:ACME client user:/var/empty:/usr/sbin/nologin	551	_acme:*:603:603::0:0:ACME client user:/var/empty:/usr/sbin/nologin
552	# free: 604	552	_sks:*:604:604::0:0:sks-keyserver user:/var/empty:/usr/sbin/nologin
553	# free: 605	553	# free: 605
554	# free: 606	554	# free: 606
555	# free: 607	555	# free: 607

Lines 544-550 Link Here

(-)GIDs (-1 / +1 lines)
544	_tss:*:601:	544	_tss:*:601:
545	_pkcs11:*:602:	545	_pkcs11:*:602:
546	_acme:*:603:	546	_acme:*:603:
547	# free: 604	547	_sks:*:604:
548	# free: 605	548	# free: 605
549	# free: 606	549	# free: 606
550	# free: 607	550	# free: 607





PORTNAME=	sks
PORTVERSION=	1.1.6
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	http://bitbucket.org/skskeyserver/sks-keyserver/downloads/



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



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:

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>




#!/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"




#!/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"

Lines 2-8 Link Here

(-)security/sks/pkg-plist (-4 lines)
2	bin/sks_add_mail	2	bin/sks_add_mail
3	bin/sks_build.sh	3	bin/sks_build.sh
4	man/man8/sks.8.gz	4	man/man8/sks.8.gz
5	%%PORTDOCS%%%%DOCSDIR%%/BUGS
6	%%PORTDOCS%%%%DOCSDIR%%/README.md
7	%%PORTDOCS%%%%DOCSDIR%%/TODO
8	%%PORTDOCS%%%%DOCSDIR%%/UPGRADING

Return to bug 235758

Lines 2-7 Link Here

(-)security/sks/Makefile (-4 / +13 lines)
2		2
3	PORTNAME= sks	3	PORTNAME= sks
4	PORTVERSION= 1.1.6	4	PORTVERSION= 1.1.6
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6	MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/	7	MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
7		8
Lines 10-19 Link Here
10		11
11	LICENSE= GPLv2+	12	LICENSE= GPLv2+
12		13
		14	USES= bdb:5 perl5 gmake shebangfix tar:tgz
13	USE_OCAML= yes	15	USE_OCAML= yes
14	USE_OCAML_CAMLP4=yes	16	USE_OCAML_CAMLP4=yes
15	USES= bdb:5 perl5 gmake shebangfix tar:tgz
16	USE_PERL5= build	17	USE_PERL5= build
		18
17	MAKE_JOBS_UNSAFE=yes	19	MAKE_JOBS_UNSAFE=yes
18	SHEBANG_FILES= sks_build.sh	20	SHEBANG_FILES= sks_build.sh
19		21
Lines 24-29 Link Here
24		26
25	SUB_FILES= pkg-message	27	SUB_FILES= pkg-message
26		28
		29	USE_RC_SUBR= sks-db sks-recon
		30	PORTDOCS= BUGS README.md TODO UPGRADING
		31
		32	USERS= _sks
		33	GROUPS= _sks
		34
27	OPTIONS_DEFINE= DOCS	35	OPTIONS_DEFINE= DOCS
28		36
29	post-extract:	37	post-extract:
Lines 40-49 Link Here
40	pre-build:	48	pre-build:
41	@cd ${WRKSRC} && test -f .depend \|\| ${MAKE_CMD} dep	49	@cd ${WRKSRC} && test -f .depend \|\| ${MAKE_CMD} dep
42		50
		51	post-install-DOCS-on:
		52	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		53	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
		54
43	post-install:	55	post-install:
44	@${MKDIR} ${STAGEDIR}${DOCSDIR}
45	cd ${WRKSRC} && ${INSTALL_DATA} BUGS README.md TODO UPGRADING \
46	${STAGEDIR}${DOCSDIR}
47	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} sks sks_add_mail	56	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} sks sks_add_mail
48		57
49	.include <bsd.port.mk>	58	.include <bsd.port.mk>

Line 0 Link Here

(-)security/sks/files/sks-db.in (+40 lines)
	1	#!/bin/sh
	2	# Created by: Michiel van Baak <michiel@vanbaak.eu>
	3	#
	4	# $FreeBSD$
	5	#
	6	# PROVIDE: sks-db
	7	# REQUIRE: DAEMON
	8	# BEFORE: sks-recon
	9
	10	. /etc/rc.subr
	11
	12	name="sks_db"
	13	rcvar=sks_db_enable
	14	load_rc_config $name
	15
	16	: ${sks_db_enable:=NO}
	17	: ${sks_db_user="_sks"}
	18	: ${sks_db_group="_sks"}
	19	: ${sks_db_datadir="/var/db/sks"}
	20	: ${sks_db_recover_onstart=NO}
	21
	22	command="/usr/local/bin/sks"
	23	command_args="-basedir ${sks_db_datadir} db"
	24	pidfile="/var/run/sks-db.pid"
	25
	26	start_precmd=sks_db_prestart
	27	start_cmd="/usr/sbin/daemon -f -p ${pidfile} -u ${sks_db_user} ${command} ${command_args}"
	28
	29	sks_db_prestart()
	30	{
	31	install -d -o ${sks_db_user} -g ${sks_db_group} ${sks_db_datadir}
	32	install -d -o ${sks_db_user} -g ${sks_db_group} ${sks_db_datadir}/KDB
	33
	34	if checkyesno sks_db_recover_onstart
	35	then
	36	/usr/local/bin/db_recover-5 -h ${sqs_db_datadir}/KDB/
	37	fi
	38	}
	39
	40	run_rc_command "$1"

Line 0 Link Here

(-)security/sks/files/sks-recon.in (+26 lines)
	1	#!/bin/sh
	2	# Created by: Michiel van Baak <michiel@vanbaak.eu>
	3	#
	4	# $FreeBSD$
	5	#
	6	# PROVIDE: sks-recon
	7	# REQUIRE: DAEMON sks-db
	8
	9	. /etc/rc.subr
	10
	11	name="sks_recon"
	12	rcvar=sks_recon_enable
	13	load_rc_config $name
	14
	15	: ${sks_recon_enable:=NO}
	16	: ${sks_recon_user="_sks"}
	17	: ${sks_recon_group="_sks"}
	18	: ${sks_recon_datadir="/var/db/sks"}
	19
	20	command="/usr/local/bin/sks"
	21	command_args="-basedir ${sks_recon_datadir} recon"
	22	pidfile="/var/run/sks-recon.pid"
	23
	24	start_cmd="/usr/sbin/daemon -f -p ${pidfile} -u ${sks_recon_user} ${command} ${command_args}"
	25
	26	run_rc_command "$1"