Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Oct 2020 13:27:51 +0000 (UTC)
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r552334 - in head/security/pam_ldap: . files
Message-ID:  <202010141327.09EDRpna060326@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: 0mp
Date: Wed Oct 14 13:27:51 2020
New Revision: 552334
URL: https://svnweb.freebsd.org/changeset/ports/552334

Log:
  security/pam_ldap: Fix pkg-message
  
  The port formatted its pkg-message with fmt(1), which broke the
  standard pkg-message UCL layout.
  
  Approved by:	portmgr blanket (build fix)

Added:
  head/security/pam_ldap/files/pkg-message.in
     - copied unchanged from r552333, head/security/pam_ldap/pkg-message
Deleted:
  head/security/pam_ldap/pkg-message
Modified:
  head/security/pam_ldap/Makefile

Modified: head/security/pam_ldap/Makefile
==============================================================================
--- head/security/pam_ldap/Makefile	Wed Oct 14 13:20:46 2020	(r552333)
+++ head/security/pam_ldap/Makefile	Wed Oct 14 13:27:51 2020	(r552334)
@@ -3,7 +3,7 @@
 
 PORTNAME=	pam_ldap
 PORTVERSION=	1.8.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security net
 MASTER_SITES=	http://www.padl.com/download/ \
 		ftp://ftp.padl.com/pub/
@@ -23,9 +23,10 @@ CONFIGURE_ARGS=	--with-ldap-lib=openldap \
 		--with-ldap-conf-file=${PREFIX}/etc/${PAM_LDAP_CONF} \
 		--with-ldap-secret-file=${PREFIX}/etc/ldap.secret
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTDATA=	*.schema
 
+SUB_FILES=	pkg-message
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|' \
 		${WRKSRC}/vers_string
@@ -33,8 +34,5 @@ post-patch:
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.schema ${STAGEDIR}${DATADIR}
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%DATADIR%%|${DATADIR}|' < ${PKGDIR}/pkg-message \
-		| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Copied: head/security/pam_ldap/files/pkg-message.in (from r552333, head/security/pam_ldap/pkg-message)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pam_ldap/files/pkg-message.in	Wed Oct 14 13:27:51 2020	(r552334, copy of r552333, head/security/pam_ldap/pkg-message)
@@ -0,0 +1,12 @@
+[
+{ 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:
+
+login	auth	sufficient	%%PREFIX%%/lib/pam_ldap.so
+EOM
+}
+]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010141327.09EDRpna060326>