Bug 174384 - [PATCH] net/nss-pam-ldapd update to 0.8.12
Summary: [PATCH] net/nss-pam-ldapd update to 0.8.12
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Jason Helfman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-12 06:20 UTC by John Marshall
Modified: 2013-01-16 00:50 UTC (History)
0 users

See Also:


Attachments
nss-pam-ldapd_0.8.10.diff (875 bytes, patch)
2012-12-12 06:20 UTC, John Marshall
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description John Marshall 2012-12-12 06:20:00 UTC
There have been two releases upstream since the version currently in the 
ports tree:

 http://arthurdejong.org/nss-pam-ldapd/release-0-8-11
 http://arthurdejong.org/nss-pam-ldapd/release-0-8-12

The attached patch updates the port to the current release version.

I have installed and tested 0.8.12 on the following platforms.  Please
note that I have *not* tested the PAM component since we don't use that
at all.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-12-12 06:20:07 UTC
Maintainer of net/nss-pam-ldapd,

Please note that PR ports/174384 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/174384

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2012-12-12 06:20:08 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Jason Helfman freebsd_committer freebsd_triage 2013-01-10 15:33:46 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jgh

I'll take it.
Comment 4 Jason Helfman freebsd_committer freebsd_triage 2013-01-15 22:00:10 UTC
State Changed
From-To: feedback->open

approved by: portmgr (tabthorpe)
Comment 5 dfilter service freebsd_committer freebsd_triage 2013-01-16 00:33:02 UTC
Author: jgh
Date: Wed Jan 16 00:32:48 2013
New Revision: 310469
URL: http://svnweb.freebsd.org/changeset/ports/310469

Log:
  - update to 0.8.12
  - while here adopt optionsNG and trim historical header
  
  PR:		174384
  Submitted by:	john.marshall@riverwillow.com.au
  Approved by:	portmgr (tabthorpe)

Modified:
  head/net/nss-pam-ldapd-sasl/Makefile
  head/net/nss-pam-ldapd/Makefile
  head/net/nss-pam-ldapd/distinfo

Modified: head/net/nss-pam-ldapd-sasl/Makefile
==============================================================================
--- head/net/nss-pam-ldapd-sasl/Makefile	Tue Jan 15 22:06:19 2013	(r310468)
+++ head/net/nss-pam-ldapd-sasl/Makefile	Wed Jan 16 00:32:48 2013	(r310469)
@@ -1,9 +1,5 @@
-# Ports collection Makefile for:	nss-pam-ldapd-sasl
-# Date created:				05-04-2012
-# Whom:					rflynn@acsalaska.net
-#
+# Created by: rflynn@acsalaska.net
 # $FreeBSD$
-#
 
 PORTNAME=		nss-pam-ldapd
 PKGNAMESUFFIX=		-sasl
@@ -13,6 +9,8 @@ COMMENT=		Advanced fork of nss_ldap with
 
 LICENSE=		# pet portlint
 
+OPTIONS_SET+=	SASL
+
 SLAVE_PORT=		sasl # In case we come up with more
 MASTERDIR=		${.CURDIR}/../nss-pam-ldapd
 

Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile	Tue Jan 15 22:06:19 2013	(r310468)
+++ head/net/nss-pam-ldapd/Makefile	Wed Jan 16 00:32:48 2013	(r310469)
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=		nss-pam-ldapd
-PORTVERSION=		0.8.10
+PORTVERSION=		0.8.12
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/
 
@@ -33,13 +33,20 @@ 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
+OPTIONS_DEFINE=	SASL
+OPTIONS_MULTI=	MG1
+OPTIONS_MULTI_MG1=	PAM NSS
+PAM_DESC=	Build pam_ldap
+NSS_DESC=	Build nss support
+SASL_DESC=	Build sasl support
+OPTIONS_DEFAULT=	PAM NSS
 CONFLICTS+=		nss-pam-ldapd-[0-9]*
 .else
-OPTIONS=		NSS		"Build nss support" on \
-			PAM		"Build pam_ldap" on
+OPTIONS_MULTI=	MG1
+OPTIONS_MULTI_MG1=	PAM NSS
+PAM_DESC=	Build pam_ldap
+NSS_DESC=	Build nss support
+OPTIONS_DEFAULT=	PAM NSS
 CONFLICTS+=		nss-pam-ldapd-sasl-[0-9]*
 .endif
 
@@ -61,14 +68,14 @@ CONFIGURE_ARGS+=	--with-ldap-conf-file=$
 PLIST_SUB+=		CONFIG="${CONFIG_FILE}"
 SUB_LIST+=		CONFIG_FILE="${PREFIX}/etc/${CONFIG_FILE}"
 
-.if defined(WITH_SASL)
+.if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
 CONFIGURE_ARGS+=	--enable-sasl
 .else
 CONFIGURE_ARGS+=	--disable-sasl
 .endif
 
-.if defined(WITH_PAM)
+.if ${PORT_OPTIONS:MPAM}
 CONFIGURE_ARGS+=	--enable-pam \
 			--with-pam-seclib-dir=${PREFIX}/lib \
 			--with-pam-ldap-soname=pam_ldap.so.${PAM_LDAP_SHMAJOR}
@@ -80,34 +87,33 @@ CONFIGURE_ARGS+=	--disable-pam
 PLIST_SUB+=		PAM="@comment "
 .endif
 
-.if defined(WITHOUT_NSS)
-CONFIGURE_ARGS+=	--disable-nss
-PLIST_SUB+=		NSS="@comment "
-SUB_LIST+=		NSS_MESSAGE=""
-.else
+.if ${PORT_OPTIONS:MNSS}
 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."
+.else
+CONFIGURE_ARGS+=	--disable-nss
+PLIST_SUB+=		NSS="@comment "
+SUB_LIST+=		NSS_MESSAGE=""
 .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 "
-.else
+.if ${PORT_OPTIONS:MNSLCD)
 CONFIGURE_ARGS+=	--enable-nslcd
 PLIST_SUB+=		NSLCD=""
 MAN5+=			nslcd.conf.5
 MAN8+=			nslcd.8
+.else
+CONFIGURE_ARGS+=	--disable-nslcd --disable-pynslcd
+PLIST_SUB+=		NSLCD="@comment "
 .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
+# these are unconditionally installed (bug filed upstream)
+MAN5+=			nslcd.conf.5
+MAN8+=			nslcd.8
 
 post-extract:
 	@${REINPLACE_CMD} -e 's/\(INSTALL_\)\(.*\)) -D /\1\2) /' ${WRKSRC}/Makefile.in ${WRKSRC}/nss/Makefile.in
@@ -122,10 +128,10 @@ show-pkgmessage::
 # file if it does not exist yet.
 post-install: show-pkgmessage
 	@${INSTALL_DATA} ${WRKSRC}/nslcd.conf ${PREFIX}/etc/nslcd.conf.sample
-.if !defined(WITHOUT_NSS)
+.if ${PORT_OPTIONS:MNSS}
 	@${LN} -fs nss_ldap.so.${NSS_LDAP_SHMAJOR} ${PREFIX}/lib/nss_ldap.so
 .endif
-.if !defined(WITHOUT_PAM)
+.if ${PORT_OPTIONS:MPAM}
 	@${LN} -fs pam_ldap.so.${PAM_LDAP_SHMAJOR} ${PREFIX}/lib/pam_ldap.so
 .endif
 

Modified: head/net/nss-pam-ldapd/distinfo
==============================================================================
--- head/net/nss-pam-ldapd/distinfo	Tue Jan 15 22:06:19 2013	(r310468)
+++ head/net/nss-pam-ldapd/distinfo	Wed Jan 16 00:32:48 2013	(r310469)
@@ -1,2 +1,2 @@
-SHA256 (nss-pam-ldapd-0.8.10.tar.gz) = 673a5e235a40fd9aac74082bc64d2ac2280fc155fb00b21092650d2c963e79cc
-SIZE (nss-pam-ldapd-0.8.10.tar.gz) = 475884
+SHA256 (nss-pam-ldapd-0.8.12.tar.gz) = d4bb255a796d59daa69e8c0aa790d15fb2a22e9706005d26e93ca52cf502ac10
+SIZE (nss-pam-ldapd-0.8.12.tar.gz) = 484453
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 6 Jason Helfman freebsd_committer freebsd_triage 2013-01-16 00:33:08 UTC
State Changed
From-To: open->closed

Committed, with changes. Thanks!
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-01-16 00:40:28 UTC
Author: jgh
Date: Wed Jan 16 00:40:16 2013
New Revision: 310470
URL: http://svnweb.freebsd.org/changeset/ports/310470

Log:
  - reverting a disable
  
  PR:		174384

Modified:
  head/net/nss-pam-ldapd/Makefile

Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile	Wed Jan 16 00:32:48 2013	(r310469)
+++ head/net/nss-pam-ldapd/Makefile	Wed Jan 16 00:40:16 2013	(r310470)
@@ -107,7 +107,7 @@ PLIST_SUB+=		NSLCD=""
 MAN5+=			nslcd.conf.5
 MAN8+=			nslcd.8
 .else
-CONFIGURE_ARGS+=	--disable-nslcd --disable-pynslcd
+CONFIGURE_ARGS+=	--disable-nslcd
 PLIST_SUB+=		NSLCD="@comment "
 .endif
 
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"