1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

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
This commit is contained in:
Mark Felder 2016-10-18 17:45:48 +00:00
parent 4e981abc79
commit 7e4fee4637
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=424189
4 changed files with 26 additions and 12 deletions

View File

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

View File

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

View File

@ -1,10 +0,0 @@
###
If you compiled with optional PAM support, you need to create a pam.d
file called `netatalk'. With the following contents:
%PAM-1.0
auth include system
account include system
password include system
session include system
###

View File

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