Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jul 2015 13:03:16 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r392567 - in head: . net/quagga
Message-ID:  <201507201303.t6KD3GUw061233@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507201303.t6KD3GUw061233>