From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Oct 3 22:20:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 120BA87F for ; Thu, 3 Oct 2013 22:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E413D2360 for ; Thu, 3 Oct 2013 22:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r93MK0BA029912 for ; Thu, 3 Oct 2013 22:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r93MK0mi029911; Thu, 3 Oct 2013 22:20:00 GMT (envelope-from gnats) Resent-Date: Thu, 3 Oct 2013 22:20:00 GMT Resent-Message-Id: <201310032220.r93MK0mi029911@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, ohauer@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 530DC74E for ; Thu, 3 Oct 2013 22:14:20 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F8FB2336 for ; Thu, 3 Oct 2013 22:14:20 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r93MEKeY029646 for ; Thu, 3 Oct 2013 22:14:20 GMT (envelope-from ohauer@freefall.freebsd.org) Received: (from ohauer@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r93MEKKZ029645; Thu, 3 Oct 2013 22:14:20 GMT (envelope-from ohauer) Message-Id: <201310032214.r93MEKKZ029645@freefall.freebsd.org> Date: Thu, 3 Oct 2013 22:14:20 GMT From: ohauer@FreeBSD.org To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/182616: [patch] net/tac_plus4 add stage support X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2013 22:20:01 -0000 >Number: 182616 >Category: ports >Synopsis: [patch] net/tac_plus4 add stage support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Oct 03 22:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: ohauer >Release: FreeBSD 8.4-RELEASE-p4 amd64 >Organization: >Environment: >Description: - add stage support - use the framework to create the tacacs user - MAKE_JOBS_UNSAFE=yes is also required for i386 patch: http://people.freebsd.org/~ohauer/diffs/stage/stage_tinderbox.diff >How-To-Repeat: >Fix: --- stage_tac_plus4.diff begins here --- Index: tac_plus4/Makefile =================================================================== --- tac_plus4/Makefile (revision 329239) +++ tac_plus4/Makefile (working copy) @@ -18,17 +18,11 @@ CONFIGURE_ARGS= --with-groupid=$$(/usr/bin/id -g tacacs 2>/dev/null || echo '559') \ --with-userid=$$(/usr/bin/id -u tacacs 2>/dev/null || echo '559') -MAN5= tac_plus.conf.5 -MAN8= tac_plus.8 tac_pwd.8 +USERS= tacacs +GROUPS= tacacs CONFLICTS= ru-tac+ia-[0-9]* tac_plus-libradius-[0-9]* - -NO_STAGE= yes -.include - -.if ${ARCH} == "amd64" MAKE_JOBS_UNSAFE= yes -.endif # check expiration dates against 'expire' field of master.passwd file .if defined(TAC_EXPIRE_MASTER_PASSWD) @@ -51,14 +45,9 @@ ${WRKSRC}/configure post-install: - ${INSTALL_DATA} ${FILESDIR}/tac_plus.conf.example ${PREFIX}/etc -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/tac_plus - ${INSTALL_DATA} ${WRKSRC}/users_guide ${PREFIX}/share/doc/tac_plus - ${INSTALL_SCRIPT} ${WRKSRC}/tac_convert ${PREFIX}/share/doc/tac_plus -.endif + ${INSTALL_DATA} ${FILESDIR}/tac_plus.conf.example ${STAGEDIR}${PREFIX}/etc + @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/tac_plus + ${INSTALL_DATA} ${WRKSRC}/users_guide ${STAGEDIR}${PREFIX}/share/doc/tac_plus + ${INSTALL_SCRIPT} ${WRKSRC}/tac_convert ${STAGEDIR}${PREFIX}/share/doc/tac_plus -.include +.include Index: tac_plus4/pkg-install =================================================================== --- tac_plus4/pkg-install (revision 329239) +++ tac_plus4/pkg-install (working copy) @@ -1,37 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - USER=tacacs - GROUP=${USER} - UID=559 - GID=${UID} - PW=/usr/sbin/pw - - if ${PW} group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if ${PW} groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if ${PW} user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if ${PW} useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d "/nonexistent" -s /sbin/nologin -c "TACACS+ Daemon User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - - exit 0 - ;; -esac Index: tac_plus4/pkg-plist =================================================================== --- tac_plus4/pkg-plist (revision 329239) +++ tac_plus4/pkg-plist (working copy) @@ -6,6 +6,9 @@ lib/libtacacs.la lib/libtacacs.so lib/libtacacs.so.1 +man/man5/tac_plus.conf.5.gz +man/man8/tac_plus.8.gz +man/man8/tac_pwd.8.gz %%PORTDOCS%%%%DOCSDIR%%/tac_convert %%PORTDOCS%%%%DOCSDIR%%/users_guide %%PORTDOCS%%@dirrm %%DOCSDIR%% --- stage_tac_plus4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: