5 files changed, 44 insertions, 3 deletions

diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 497a6987be4c..837c8c696145 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	0.98.6
+PORTVERSION=	0.98.7
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pureftpd
@@ -33,6 +33,20 @@ CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 MAN8=		pure-ftpd.8 pure-ftpwho.8 pure-mrtginfo.8 pure-uploadscript.8
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 500000
+PAM_TEMPL?=	${FILESDIR}/pam.conf.5
+.else
+. if ${OSVERSION} > 400000
+PAM_TEMPL?=	${FILESDIR}/pam.conf.4
+. endif
+.endif
+.if defined(PAM_TEMPL)
+PAM_DIR?=	${PREFIX}/share/examples/${PORTNAME}/pam
+PAM_TARGET?=	pure-ftpd
+.endif
+
 DOCS=		AUTHORS CONTACT COPYING HISTORY NEWS \
 		README README.Configuration-File README.Contrib README.LDAP \
 		README.Netfilter \
@@ -57,5 +71,11 @@ post-install:
 	@${MKDIR} ${PREFIX}/share/doc/pure-ftpd
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/pure-ftpd)
 .endif
+.if defined(PAM_TEMPL)
+	${MKDIR} ${PAM_DIR}
+	${INSTALL_DATA} ${PAM_TEMPL} ${PAM_DIR}/${PAM_TARGET}
+	@${ECHO} "Now you need to examine ${PAM_DIR}/${PAM_TARGET}"
+	@${ECHO} "and add the relevant PAM configuration lines to your /etc/pam.conf file."
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/ftp/pure-ftpd/distinfo b/ftp/pure-ftpd/distinfo
index 8cf18531627c..43ef43b2a32c 100644
--- a/ftp/pure-ftpd/distinfo
+++ b/ftp/pure-ftpd/distinfo
@@ -1 +1 @@
-MD5 (pure-ftpd-0.98.6.tar.gz) = d7e93f2edd42058c13f1e0ab9b23e8a2
+MD5 (pure-ftpd-0.98.7.tar.gz) = 381169cc31fdebfa2d414cd264d8485b
diff --git a/ftp/pure-ftpd/files/pam.conf.4 b/ftp/pure-ftpd/files/pam.conf.4
new file mode 100644
index 000000000000..3cc0dfb89d69
--- /dev/null
+++ b/ftp/pure-ftpd/files/pam.conf.4
@@ -0,0 +1,7 @@
+# pure-ftpd
+pure-ftpd	auth	sufficient	pam_skey.so
+pure-ftpd	auth	requisite	pam_cleartext_pass_ok.so
+#pure-ftpd	auth	sufficient	pam_kerberosIV.so	try_first_pass
+pure-ftpd	auth	required	pam_unix.so		try_first_pass
+pure-ftpd	account	required	pam_permit.so
+pure-ftpd	session	required	pam_permit.so
diff --git a/ftp/pure-ftpd/files/pam.conf.5 b/ftp/pure-ftpd/files/pam.conf.5
new file mode 100644
index 000000000000..2859a73a05fd
--- /dev/null
+++ b/ftp/pure-ftpd/files/pam.conf.5
@@ -0,0 +1,12 @@
+# pure-ftpd
+pure-ftpd	auth	required	pam_nologin.so
+#pure-ftpd	auth	sufficient	pam_kerberosIV.so
+#pure-ftpd	auth	sufficient	pam_krb5.so
+#pure-ftpd	auth	required	pam_opie.so
+pure-ftpd	auth	required	pam_unix.so		try_first_pass
+#pure-ftpd	account	required	pam_kerberosIV.so
+#pure-ftpd	account	required	pam_krb5.so
+pure-ftpd	account	required	pam_permit.so
+pure-ftpd	session	required	pam_permit.so
+#pure-ftpd	session	required	pam_kerberosIV.so
+#pure-ftpd	session	required	pam_krb5.so
diff --git a/ftp/pure-ftpd/pkg-plist b/ftp/pure-ftpd/pkg-plist
index 8be379445cd4..cfc357eb387e 100644
--- a/ftp/pure-ftpd/pkg-plist
+++ b/ftp/pure-ftpd/pkg-plist
@@ -18,4 +18,6 @@ etc/pure-ftpd.conf.sample
 %%PORTDOCS%%share/doc/pure-ftpd/THANKS
 %%PORTDOCS%%@dirrm share/doc/pure-ftpd
 share/examples/pure-ftpd/xml_python_processors.txt
+share/examples/pure-ftpd/pam/pure-ftpd
+@dirrm share/examples/pure-ftpd/pam
 @dirrm share/examples/pure-ftpd