ports/166810: [MAINTAINER-UPDATE] net/nss-pam-ldapd: update to 0.8.6_1
Mel FLynn
rflynn at acsalaska.net
Tue Apr 10 00:20:12 UTC 2012
>Number: 166810
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] net/nss-pam-ldapd: update to 0.8.6_1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 10 00:20:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Mel FLynn
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD datakitty.lan.rachie.is-a-geek.net 8.2-STABLE FreeBSD 8.2-STABLE #6 r230977: Sun Feb 5 06:20:11
>Description:
Update to 0.8.6_1:
- Implement slave support
- Move to pkg-message instead of post-install warning message and point the
users towards rc.d/nslcd.
- Hook NSS into OPTIONS, default on instead of hidden WITHOUT_NSS var
- Quote SUB vars
Added file(s):
- files/pkg-message.in
Changed file:
- Makefile
Generated with FreeBSD Port Tools 0.99_5 (mode: update, diff: suffix)
>How-To-Repeat:
>Fix:
--- nss-pam-ldapd-0.8.6_1.patch begins here ---
diff -ruN --exclude=CVS ../nss-pam-ldapd.orig/Makefile ./Makefile
--- ../nss-pam-ldapd.orig/Makefile 2012-04-01 10:17:17.000000000 -0800
+++ ./Makefile 2012-04-07 09:53:08.000000000 -0800
@@ -7,12 +7,13 @@
PORTNAME= nss-pam-ldapd
PORTVERSION= 0.8.6
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \
http://static.ipfw.ru/files/
-MAINTAINER= rflynn at acsalaska.net
-COMMENT= Advanced fork of nss_ldap
+MAINTAINER?= rflynn at acsalaska.net
+COMMENT?= Advanced fork of nss_ldap
LICENSE= LGPL21 LGPL3
LICENSE_COMB= dual
@@ -23,12 +24,21 @@
USE_RC_SUBR= nslcd
PAM_LDAP_SHMAJOR= 1
NSS_LDAP_SHMAJOR= 1
+PKGMESSAGE= ${WRKDIR}/pkg-message
+SUB_FILES+= pkg-message
NSLCD_PIDFILE?= /var/run/nslcd.pid
NSLCD_SOCKET?= /var/run/nslcd.ctl
+.if defined(SLAVE_PORT)
+OPTIONS= PAM "Build pam_ldap" on \
+ NSS "Build nss support" on \
+WITH_SASL=yes
+.else
OPTIONS= SASL "Enable SASL" off \
+ NSS "Build nss support" on \
PAM "Build pam_ldap" on
+.endif
USERS= nslcd
GROUPS= nslcd
@@ -45,7 +55,8 @@
CONFIG_FILE= "nslcd.conf"
CONFIGURE_ARGS+= --with-ldap-conf-file=${PREFIX}/etc/${CONFIG_FILE}
-PLIST_SUB+= CONFIG=${CONFIG_FILE}
+PLIST_SUB+= CONFIG="${CONFIG_FILE}"
+SUB_LIST+= CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}"
.if defined(WITH_SASL)
WANT_OPENLDAP_SASL= yes
@@ -69,12 +80,17 @@
.if defined(WITHOUT_NSS)
CONFIGURE_ARGS+= --disable-nss
PLIST_SUB+= NSS="@comment "
+SUB_LIST+= NSS_MESSAGE=""
.else
CONFIGURE_ARGS+= --enable-nss
CONFLICTS+= nss_ldap-1.*
PLIST_SUB+= NSS=""
+SUB_LIST+= NSS_MESSAGE="WARNING: Be sure to set uid and gid configuration parameters to make nslcd run under unprivileged user."
.endif
+# Won't hook this in to OPTIONS until PADL ports are at least DEPRECATED.
+# It doesn't do the software any good to run as replacement for the PADL ports
+# without running the daemon.
.if defined(WITHOUT_NSLCD)
CONFIGURE_ARGS+= --disable-nslcd
PLIST_SUB+= NSLCD="@comment "
@@ -85,13 +101,21 @@
MAN8+= nslcd.8
.endif
+.if defined(WITHOUT_NSS) && defined(WITHOUT_PAM)
+BROKEN= Software is useless if both NSS and PAM are disabled.\
+ Rerun 'make config' or 'portmaster --force-config'.
+.endif
+
post-extract:
@${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in
post-configure:
${REINPLACE_CMD} -e 's/^\(CFLAGS.*\) \-O2 \(.*\)$$/\1 -O0 \2/' ${WRKSRC}/nss/Makefile
-post-install:
+show-pkgmessage::
+ @${ECHO_CMD}; cat ${PKGMESSAGE} | fmt 75 79; ${ECHO_CMD}
+
+post-install: show-pkgmessage
.if !defined(WITHOUT_NSS)
@cd ${PREFIX}/lib && ${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} \
nss_ldap.so
@@ -100,18 +124,5 @@
@cd ${PREFIX}/lib && ${LN} -fs pam_ldap.so.${PAM_LDAP_SHMAJOR} \
pam_ldap.so
.endif
- @${ECHO_MSG}
- @${ECHO_MSG} =====================================================================
- @${ECHO_MSG}
- @${ECHO_MSG} " LDAP configuration: ${PREFIX}/etc/${CONFIG_FILE}"
- @${ECHO_MSG} " Sample configuration: ${PREFIX}/etc/${CONFIG_FILE}.sample"
- @${ECHO_MSG}
-.if !defined(WITHOUT_NSS)
- @${ECHO_MSG} " WARNING: Be sure to set uid and gid configuration parameters"
- @${ECHO_MSG} " WARNING: to make nslcd run under unprivileged user"
-.endif
- @${ECHO_MSG}
- @${ECHO_MSG} =====================================================================
- @${ECHO_MSG}
.include <bsd.port.mk>
diff -ruN --exclude=CVS ../nss-pam-ldapd.orig/files/pkg-message.in ./files/pkg-message.in
--- ../nss-pam-ldapd.orig/files/pkg-message.in 1969-12-31 14:00:00.000000000 -1000
+++ ./files/pkg-message.in 2012-04-07 09:45:06.000000000 -0800
@@ -0,0 +1,12 @@
+=====================================================================
+
+LDAP and nslcd daemon parameters should be set in %%CONFIG_FILE%%. When upgrading review %%CONFIG_FILE%%.sample for additional or changed parameters.
+
+%%NSS_MESSAGE%%
+
+To start nslcd add nslcd_enable="YES" to /etc/rc.conf and run:
+
+ # service nslcd start
+
+See the comments in %%PREFIX%%/etc/rc.d/nslcd for additional tunables.
+=====================================================================
--- nss-pam-ldapd-0.8.6_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list