From owner-svn-ports-head@freebsd.org Mon Jul 20 13:03:17 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 51AF39A66EC; Mon, 20 Jul 2015 13:03:17 +0000 (UTC) (envelope-from bapt@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 2867913E4; Mon, 20 Jul 2015 13:03:17 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KD3GRp061236; Mon, 20 Jul 2015 13:03:16 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KD3GUw061233; Mon, 20 Jul 2015 13:03:16 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201507201303.t6KD3GUw061233@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 20 Jul 2015 13:03:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392567 - in head: . net/quagga 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: Mon, 20 Jul 2015 13:03:17 -0000 Author: bapt Date: Mon Jul 20 13:03:15 2015 New Revision: 392567 URL: https://svnweb.freebsd.org/changeset/ports/392567 Log: Fix with custom SYSCONF_DIR and fix qa tests Change the home directory of the quagga user to /var/empty which prevent QA First the home does not need to be harcoded to /usr/local/etc/quagga, second it fixes issues where the home created by the user addition is 755 then the plist modifies it to 750 Reviewed by: mat Approved by: mat (maintainer) Sponsored by: gandi.net Differential Revision: https://reviews.freebsd.org/D3135 Modified: head/UIDs head/net/quagga/Makefile head/net/quagga/pkg-plist Modified: head/UIDs ============================================================================== --- head/UIDs Mon Jul 20 13:01:33 2015 (r392566) +++ head/UIDs Mon Jul 20 13:03:15 2015 (r392567) @@ -47,7 +47,7 @@ mud:*:97:97::0:0:MUD Owner:/nonexistent: msql:*:98:98::0:0:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi squid:*:100:100::0:0:squid caching-proxy pseudo user:/var/squid:/usr/sbin/nologin -quagga:*:101:101::0:0:Quagga route daemon pseudo user:/usr/local/etc/quagga:/usr/sbin/nologin +quagga:*:101:101::0:0:Quagga route daemon pseudo user:/var/empty:/usr/sbin/nologin ganglia:*:102:102::0:0:Ganglia User:/nonexistent:/usr/sbin/nologin sgeadmin:*:103:103::0:0:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin slimserv:*:104:104::0:0:Slim Devices SlimServer pseudo-user:/nonexistent:/usr/sbin/nologin Modified: head/net/quagga/Makefile ============================================================================== --- head/net/quagga/Makefile Mon Jul 20 13:01:33 2015 (r392566) +++ head/net/quagga/Makefile Mon Jul 20 13:03:15 2015 (r392567) @@ -3,7 +3,7 @@ PORTNAME= quagga PORTVERSION= 0.99.24.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH @@ -102,6 +102,6 @@ pre-everything:: post-install: ${MKDIR} ${STAGEDIR}${LOCALSTATE_DIR} ${STAGEDIR}${SYSCONF_DIR} \ ${STAGEDIR}${EXAMPLESDIR} - @${MV} ${STAGEDIR}${ETCDIR}/* ${STAGEDIR}${EXAMPLESDIR} + @${MV} ${STAGEDIR}${SYSCONF_DIR}/* ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/net/quagga/pkg-plist ============================================================================== --- head/net/quagga/pkg-plist Mon Jul 20 13:01:33 2015 (r392566) +++ head/net/quagga/pkg-plist Mon Jul 20 13:03:15 2015 (r392567) @@ -95,4 +95,4 @@ sbin/zebra %%EXAMPLESDIR%%/vtysh.conf.sample %%EXAMPLESDIR%%/zebra.conf.sample @dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%LOCALSTATE_DIR%% -@dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%ETCDIR%% +@dir(%%ENABLE_USER%%,%%ENABLE_GROUP%%,750) %%SYSCONF_DIR%%