From owner-svn-ports-head@freebsd.org Fri Jul 24 10:54:43 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F1829A985D; Fri, 24 Jul 2015 10:54:43 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22F7E1176; Fri, 24 Jul 2015 10:54:43 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OAsgcf041871; Fri, 24 Jul 2015 10:54:43 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OAsgF5041869; Fri, 24 Jul 2015 10:54:42 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201507241054.t6OAsgF5041869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Fri, 24 Jul 2015 10:54:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392817 - in head/security/shibboleth2-sp: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Jul 2015 10:54:43 -0000 Author: girgen Date: Fri Jul 24 10:54:41 2015 New Revision: 392817 URL: https://svnweb.freebsd.org/changeset/ports/392817 Log: The new shibboleth will refuse to accept -u when it was already su:ed to that user. Trust shibboleth to change user. Modified: head/security/shibboleth2-sp/Makefile head/security/shibboleth2-sp/files/shibboleth-sp.in Modified: head/security/shibboleth2-sp/Makefile ============================================================================== --- head/security/shibboleth2-sp/Makefile Fri Jul 24 10:11:18 2015 (r392816) +++ head/security/shibboleth2-sp/Makefile Fri Jul 24 10:54:41 2015 (r392817) @@ -3,6 +3,7 @@ PORTNAME= shibboleth-sp PORTVERSION= 2.5.5 +PORTREVISION= 1 CATEGORIES= security www MASTER_SITES= http://shibboleth.net/downloads/service-provider/${PORTVERSION}/ Modified: head/security/shibboleth2-sp/files/shibboleth-sp.in ============================================================================== --- head/security/shibboleth2-sp/files/shibboleth-sp.in Fri Jul 24 10:11:18 2015 (r392816) +++ head/security/shibboleth2-sp/files/shibboleth-sp.in Fri Jul 24 10:54:41 2015 (r392817) @@ -21,13 +21,13 @@ restart_precmd="shibboleth_sp_configtest configtest_cmd="shibboleth_sp_configtest" keygen_cmd="shibboleth_sp_keygen" -shibboleth_sp_user=%%SHIBD_USER%% +shibboleth_sp_usr=%%SHIBD_USER%% shibboleth_sp_group=%%SHIBD_GROUP%% www_group=%%WWWGRP%% load_rc_config $name -command_args="-f -p ${pidfile} -u ${shibboleth_sp_user} -g ${shibboleth_sp_group}" +command_args="-f -p ${pidfile} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group}" confdir=${SHIBSP_CFGDIR:-%%PREFIX%%/etc}/shibboleth cert=sp-cert.pem key=sp-key.pem @@ -37,20 +37,20 @@ shibboleth_sp_configtest() { run_rc_command keygen else # update from 2.4.x, chown %%SHIBD_USER%% the key and cert - chown ${shibboleth_sp_user}:${shibboleth_sp_group} ${confdir}/${key} ${confdir}/${cert} + chown ${shibboleth_sp_usr}:${shibboleth_sp_group} ${confdir}/${key} ${confdir}/${cert} chmod 400 ${confdir}/${key} chmod 444 ${confdir}/${cert} fi # In FreeBSD 10 (r258664), /var/cache mode is corrected to 755. make sure we have that mode. chmod 755 /var/cache - install -d -o ${shibboleth_sp_user} -g ${shibboleth_sp_group} /var/log/shibboleth - install -d -o ${shibboleth_sp_user} -g ${shibboleth_sp_group} /var/cache/shibboleth - install -d -o ${shibboleth_sp_user} -g ${www_group} -m 750 /var/run/shibboleth - ${command} ${shibboleth_sp_flags} -u ${shibboleth_sp_user} -g ${shibboleth_sp_group} -t + install -d -o ${shibboleth_sp_usr} -g ${shibboleth_sp_group} /var/log/shibboleth + install -d -o ${shibboleth_sp_usr} -g ${shibboleth_sp_group} /var/cache/shibboleth + install -d -o ${shibboleth_sp_usr} -g ${www_group} -m 750 /var/run/shibboleth + ${command} ${shibboleth_sp_flags} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group} -t } shibboleth_sp_keygen() { - %%SH%% ${confdir}/keygen.sh -o ${confdir} -u ${shibboleth_sp_user} -g ${shibboleth_sp_group} + %%SH%% ${confdir}/keygen.sh -o ${confdir} -u ${shibboleth_sp_usr} -g ${shibboleth_sp_group} } extra_commands="configtest keygen"