From owner-svn-ports-head@freebsd.org  Tue Oct 18 17:45:49 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
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 D00F9C179DF;
 Tue, 18 Oct 2016 17:45:49 +0000 (UTC)
 (envelope-from feld@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 mx1.freebsd.org (Postfix) with ESMTPS id 86555775;
 Tue, 18 Oct 2016 17:45:49 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IHjm06003034;
 Tue, 18 Oct 2016 17:45:48 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IHjmJU003032;
 Tue, 18 Oct 2016 17:45:48 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201610181745.u9IHjmJU003032@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 18 Oct 2016 17:45:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424189 - in head/net/netatalk3: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Oct 2016 17:45:49 -0000

Author: feld
Date: Tue Oct 18 17:45:48 2016
New Revision: 424189
URL: https://svnweb.freebsd.org/changeset/ports/424189

Log:
  net/netatalk3: Fix PAM option
  
  Previous rollback of PAM changes didn't update pkg-plist, so the PAM
  option was broken.
  
  By using @sample if PAM option is enabled we can install a default PAM
  config that inherits the system PAM configuration while allowing custom
  configs to remain untouched.
  
  PR:		213349
  MFH:		2016Q4

Added:
  head/net/netatalk3/files/pam.conf   (contents, props changed)
Deleted:
  head/net/netatalk3/pkg-message
Modified:
  head/net/netatalk3/Makefile
  head/net/netatalk3/pkg-plist

Modified: head/net/netatalk3/Makefile
==============================================================================
--- head/net/netatalk3/Makefile	Tue Oct 18 17:37:33 2016	(r424188)
+++ head/net/netatalk3/Makefile	Tue Oct 18 17:45:48 2016	(r424189)
@@ -3,6 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.10
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -73,6 +74,8 @@ LIBWRAP_CONFIGURE_ENABLE=tcp-wrappers
 
 CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-[12]* yudit-[0-9]*
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \
 		s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \
@@ -87,4 +90,8 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${STAGEDIR}${PREFIX}/bin/macusers
 
-.include <bsd.port.mk>
+.if ${PORT_OPTIONS:MPAM}
+	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/netatalk.sample
+.endif
+
+.include <bsd.port.post.mk>

Added: head/net/netatalk3/files/pam.conf
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/netatalk3/files/pam.conf	Tue Oct 18 17:45:48 2016	(r424189)
@@ -0,0 +1,17 @@
+#
+# $FreeBSD$
+#
+# PAM configuration for the "netatalk" service
+#
+
+# auth
+auth		include		system
+
+# account
+account		include		system
+
+# password
+password	include		system
+
+# session
+session		include		system

Modified: head/net/netatalk3/pkg-plist
==============================================================================
--- head/net/netatalk3/pkg-plist	Tue Oct 18 17:37:33 2016	(r424188)
+++ head/net/netatalk3/pkg-plist	Tue Oct 18 17:45:48 2016	(r424189)
@@ -12,7 +12,7 @@ bin/netatalk-config
 %%DBUS%%etc/dbus-1/system.d/netatalk-dbus.conf
 %%DBUS%%etc/dbus-session.conf.netatalk
 @sample etc/extmap.conf.sample
-%%PAM%%etc/pam.d/netatalk
+%%PAM%%@sample etc/pam.d/netatalk.sample
 libexec/netatalk-uams/uams_clrtxt.so
 libexec/netatalk-uams/uams_dhx.so
 libexec/netatalk-uams/uams_dhx2.so