From owner-svn-ports-all@freebsd.org Fri Feb 15 04:37:28 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B5F514EEB5C; Fri, 15 Feb 2019 04:37:28 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3D60F7607E; Fri, 15 Feb 2019 04:37:28 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3113F198AE; Fri, 15 Feb 2019 04:37:28 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1F4bSsB039814; Fri, 15 Feb 2019 04:37:28 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1F4bP4q039802; Fri, 15 Feb 2019 04:37:25 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201902150437.x1F4bP4q039802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Fri, 15 Feb 2019 04:37:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492968 - in head/security: krb5-115 krb5-115/files krb5-116 krb5-116/files krb5-117 krb5-117/files krb5-devel krb5-devel/files X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: in head/security: krb5-115 krb5-115/files krb5-116 krb5-116/files krb5-117 krb5-117/files krb5-devel krb5-devel/files X-SVN-Commit-Revision: 492968 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3D60F7607E X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.96)[-0.965,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2019 04:37:28 -0000 Author: cy Date: Fri Feb 15 04:37:25 2019 New Revision: 492968 URL: https://svnweb.freebsd.org/changeset/ports/492968 Log: Provide a script from which to start krb5kdc through /etc/rc.d/kdc. Simply add kdc_enable="YES" and kdc_program="/usr/local/sbin/kdc" to /etc/rc.d. The script removes the Heimdal kdc --detach argument prior to invoking krb5kdc. The other approach that was considered was to replace getopt() in kdc/main.c with getopt_long() however this approach was considered too intrusive. Added: head/security/krb5-115/files/kdc.in (contents, props changed) head/security/krb5-116/files/kdc.in (contents, props changed) head/security/krb5-117/files/kdc.in (contents, props changed) head/security/krb5-devel/files/kdc.in (contents, props changed) Modified: head/security/krb5-115/Makefile head/security/krb5-115/pkg-plist head/security/krb5-116/Makefile head/security/krb5-116/pkg-plist head/security/krb5-117/Makefile head/security/krb5-117/pkg-plist head/security/krb5-devel/Makefile head/security/krb5-devel/pkg-plist Modified: head/security/krb5-115/Makefile ============================================================================== --- head/security/krb5-115/Makefile Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-115/Makefile Fri Feb 15 04:37:25 2019 (r492968) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.15.5 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) @@ -109,6 +110,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 + @${SED} "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/kdc.in > ${STAGEDIR}${PREFIX}/sbin/kdc; \ + ${CHMOD} +x ${STAGEDIR}${PREFIX}/sbin/kdc # html documentation .if ${PORT_OPTIONS:MKRB5_PDF} pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` Added: head/security/krb5-115/files/kdc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-115/files/kdc.in Fri Feb 15 04:37:25 2019 (r492968) @@ -0,0 +1,5 @@ +#!/bin/sh - +# $FreeBSD$ + +set -- $(echo "$*" | sed 's/--detach//') +exec %%PREFIX%%/sbin/krb5kdc "$@" Modified: head/security/krb5-115/pkg-plist ============================================================================== --- head/security/krb5-115/pkg-plist Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-115/pkg-plist Fri Feb 15 04:37:25 2019 (r492968) @@ -149,6 +149,7 @@ sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util +sbin/kdc sbin/kdb5_util sbin/kprop sbin/kpropd Modified: head/security/krb5-116/Makefile ============================================================================== --- head/security/krb5-116/Makefile Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-116/Makefile Fri Feb 15 04:37:25 2019 (r492968) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.16.3 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) @@ -106,6 +107,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 + @${SED} "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/kdc.in > ${STAGEDIR}${PREFIX}/sbin/kdc; \ + ${CHMOD} +x ${STAGEDIR}${PREFIX}/sbin/kdc # html documentation .if ${PORT_OPTIONS:MKRB5_PDF} pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` Added: head/security/krb5-116/files/kdc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-116/files/kdc.in Fri Feb 15 04:37:25 2019 (r492968) @@ -0,0 +1,5 @@ +#!/bin/sh - +# $FreeBSD$ + +set -- $(echo "$*" | sed 's/--detach//') +exec %%PREFIX%%/sbin/krb5kdc "$@" Modified: head/security/krb5-116/pkg-plist ============================================================================== --- head/security/krb5-116/pkg-plist Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-116/pkg-plist Fri Feb 15 04:37:25 2019 (r492968) @@ -153,6 +153,7 @@ sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util +sbin/kdc sbin/kdb5_util sbin/kprop sbin/kpropd Modified: head/security/krb5-117/Makefile ============================================================================== --- head/security/krb5-117/Makefile Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-117/Makefile Fri Feb 15 04:37:25 2019 (r492968) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.17 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ .if !defined(MASTERDIR) @@ -110,6 +111,8 @@ PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 + @${SED} "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/kdc.in > ${STAGEDIR}${PREFIX}/sbin/kdc; \ + ${CHMOD} +x ${STAGEDIR}${PREFIX}/sbin/kdc # html documentation .if ${PORT_OPTIONS:MKRB5_PDF} pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` Added: head/security/krb5-117/files/kdc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-117/files/kdc.in Fri Feb 15 04:37:25 2019 (r492968) @@ -0,0 +1,5 @@ +#!/bin/sh - +# $FreeBSD$ + +set -- $(echo "$*" | sed 's/--detach//') +exec %%PREFIX%%/sbin/krb5kdc "$@" Modified: head/security/krb5-117/pkg-plist ============================================================================== --- head/security/krb5-117/pkg-plist Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-117/pkg-plist Fri Feb 15 04:37:25 2019 (r492968) @@ -155,6 +155,7 @@ sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util +sbin/kdc sbin/kdb5_util sbin/kprop sbin/kpropd Modified: head/security/krb5-devel/Makefile ============================================================================== --- head/security/krb5-devel/Makefile Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-devel/Makefile Fri Feb 15 04:37:25 2019 (r492968) @@ -3,6 +3,7 @@ PORTNAME= krb5 PORTVERSION= 1.18.${MIT_COMMIT_DATE} +PORTREVISION= 1 CATEGORIES= security .if !defined(MASTERDIR) PKGNAMESUFFIX= -devel @@ -107,6 +108,8 @@ CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_T post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/krb5 ${ECHO_CMD} @dir share/doc/krb5 >> ${TMPPLIST} + @${SED} "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/kdc.in > ${STAGEDIR}${PREFIX}/sbin/kdc; \ + ${CHMOD} +x ${STAGEDIR}${PREFIX}/sbin/kdc post-install-LDAP-on: ${MKDIR} ${STAGEDIR}${DATADIR} Added: head/security/krb5-devel/files/kdc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/krb5-devel/files/kdc.in Fri Feb 15 04:37:25 2019 (r492968) @@ -0,0 +1,5 @@ +#!/bin/sh - +# $FreeBSD$ + +set -- $(echo "$*" | sed 's/--detach//') +exec %%PREFIX%%/sbin/krb5kdc "$@" Modified: head/security/krb5-devel/pkg-plist ============================================================================== --- head/security/krb5-devel/pkg-plist Fri Feb 15 03:09:33 2019 (r492967) +++ head/security/krb5-devel/pkg-plist Fri Feb 15 04:37:25 2019 (r492968) @@ -154,6 +154,7 @@ sbin/gss-server sbin/kadmin.local sbin/kadmind %%LDAP%%sbin/kdb5_ldap_util +sbin/kdc sbin/kdb5_util sbin/kprop sbin/kpropd