svn commit: r552742 - in head/security/pam_ldap: . files

[Joe Marcus Clarke]

Author: marcus
Date: Mon Oct 19 15:02:14 2020
New Revision: 552742
URL: https://svnweb.freebsd.org/changeset/ports/552742

Log:
  More cleanup.
  
  * Use the upstream 86 version instead of the artificial 1.8.6 [1]
  * Use @sample to handle the config file [2]
  
  Thanks to 0mp for the good suggestions.
  
  PR:		250341 [1]
  		250343 [2]

Modified:
  head/security/pam_ldap/Makefile
  head/security/pam_ldap/distinfo
  head/security/pam_ldap/files/patch-Makefile.in
  head/security/pam_ldap/files/pkg-message.in
  head/security/pam_ldap/pkg-plist

Modified: head/security/pam_ldap/Makefile
==============================================================================
--- head/security/pam_ldap/Makefile	Mon Oct 19 14:59:18 2020	(r552741)
+++ head/security/pam_ldap/Makefile	Mon Oct 19 15:02:14 2020	(r552742)
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	pam_ldap
-PORTVERSION=	1.8.6
-PORTREVISION=	5
+PORTVERSION=	186
 CATEGORIES=	security net
 MASTER_SITES=	http://www.padl.com/download/ \
 		ftp://ftp.padl.com/pub/
-DISTNAME=	pam_ldap-${PORTVERSION:S/.//g}
 
 MAINTAINER=	marcus at FreeBSD.org
 COMMENT=	PAM module for authenticating with LDAP

Modified: head/security/pam_ldap/distinfo
==============================================================================
--- head/security/pam_ldap/distinfo	Mon Oct 19 14:59:18 2020	(r552741)
+++ head/security/pam_ldap/distinfo	Mon Oct 19 15:02:14 2020	(r552742)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1603117469
 SHA256 (pam_ldap-186.tar.gz) = c8fe22d559d5a3f528b24eb97175085f188c0f11ade337a868590ac0e0716453
 SIZE (pam_ldap-186.tar.gz) = 163437

Modified: head/security/pam_ldap/files/patch-Makefile.in
==============================================================================
--- head/security/pam_ldap/files/patch-Makefile.in	Mon Oct 19 14:59:18 2020	(r552741)
+++ head/security/pam_ldap/files/patch-Makefile.in	Mon Oct 19 15:02:14 2020	(r552742)
@@ -14,10 +14,10 @@
  install-data-local:
  	@$(NORMAL_INSTALL)
 -	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \
-+	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.dist; then \
++	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf.sample; then \
  		$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
 -		$(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
-+		$(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.dist; \
++		$(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf.sample; \
  	fi
  
  uninstall-local:

Modified: head/security/pam_ldap/files/pkg-message.in
==============================================================================
--- head/security/pam_ldap/files/pkg-message.in	Mon Oct 19 14:59:18 2020	(r552741)
+++ head/security/pam_ldap/files/pkg-message.in	Mon Oct 19 15:02:14 2020	(r552742)
@@ -1,10 +1,8 @@
 [
 { type: install
   message: <<EOM
-Copy %%PREFIX%%/etc/ldap.conf.dist to %%PREFIX%%/etc/ldap.conf, then edit
-%%PREFIX%%/etc/ldap.conf in order to use this module.  Add a line similar to
-the following to /etc/pam.conf on 4.X, or create an /etc/pam.d/ldap
-on 5.X and higher with a line similar to the following:
+Edit %%PREFIX%%/etc/ldap.conf in order to use this module.  Then
+create a %%LOCALBASE%%/etc/pam.d/ldap with a line similar to the following:
 
 login	auth	sufficient	%%PREFIX%%/lib/pam_ldap.so
 EOM

Modified: head/security/pam_ldap/pkg-plist
==============================================================================
--- head/security/pam_ldap/pkg-plist	Mon Oct 19 14:59:18 2020	(r552741)
+++ head/security/pam_ldap/pkg-plist	Mon Oct 19 15:02:14 2020	(r552742)
@@ -1,3 +1,3 @@
 man/man5/pam_ldap.5.gz
-etc/ldap.conf.dist
+ at sample etc/ldap.conf.sample
 lib/pam_ldap.so