Date: Tue, 18 Oct 2016 17:45:48 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424189 - in head/net/netatalk3: . files Message-ID: <201610181745.u9IHjmJU003032@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610181745.u9IHjmJU003032>