Bug 175340 - [PATCH] net/nss-pam-ldapd Default nslcd build broken
Summary: [PATCH] net/nss-pam-ldapd Default nslcd build broken
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: 2013-01-16 02:20 UTC by John Marshall
Modified: 2013-01-22 07:30 UTC (History)
0 users

See Also:


Attachments
nss-pam-ldapd.diff (972 bytes, patch)
2013-01-16 02: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 2013-01-16 02:20:00 UTC
The optionsNG rewrite by the commiter in r310469 unintentionally broke
the default build of the nslcd daemon.  The incorrect assumption was
that a NSLCD option existed.  The port's maintainer has a note in the
Makefile about not wanting to make NSLCD an option (yet), so the
attached patch reverts to the previous code (which disables build of
nslcd ONLY if WITHOUT_NSLCD is defined) rather than adding a NSLCD
option to correct the introduced problem.

How-To-Repeat: 
Install the port and try (/usr/local/etc/rc.d/nslcd start).  The rc
script fails because it cannot find the daemon.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-16 02:20:08 UTC
Maintainer of net/nss-pam-ldapd,

Please note that PR ports/175340 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/175340

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-01-16 02:20:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 John Marshall 2013-01-16 02:33:40 UTC
Woops.  I guess that Makefile patch should include a PORTREVISION bump
as well?

-- 
John Marshall
Comment 4 Jason Helfman freebsd_committer freebsd_triage 2013-01-16 03:58:22 UTC
Responsible Changed
From-To: freebsd-ports-bugs->jgh

I'll take it.
Comment 5 John Marshall 2013-01-16 06:04:49 UTC
Just to be clear...

My purpose in raising this PR was not to criticize or in any way slight
the commiter (jgh@).  My purpose was only to draw attention to the fact
that that commit broke the existing behaviour where nslcd would build
unless it was told not to (by defining the WITHOUT_NSLCD knob).

The commiter's work in converting the port Makefile to optionsNG is
appreciated.  It is evidence of 'going the extra mile' when the
opportunity is there, of diligence in his work, and of the time he gives
freely to the Project.  The optionsNG conversion changed the default
behaviour of the port so that it no longer builds nslcd by default
because the option name implied by the pre-optionsNG Makefile knob does
not exist.

In the 'Description' section of this PR, I state that, 'the commiter...
unintentionally broke the default build of the nslcd daemon', and that,
'The incorrect assumption was that a NSLCD option existed'.  It was
wrong of me to ascribe any intentions or assumptions to jgh@ and I
apologize unconditionally.

-- 
John Marshall
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-01-22 07:26:51 UTC
Author: jgh
Date: Tue Jan 22 07:26:38 2013
New Revision: 310808
URL: http://svnweb.freebsd.org/changeset/ports/310808

Log:
  - add NSLCD KNOB reverted in r310469
  
  PR:		175340
  Submitted by:	 john.marshall@riverwillow.com.au
  Reviewed by:	bapt (portmgr)
  Approved by:	maintainer, rflynn@acsalaska.net (implicit)

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

Modified: head/net/nss-pam-ldapd/Makefile
==============================================================================
--- head/net/nss-pam-ldapd/Makefile	Tue Jan 22 07:20:08 2013	(r310807)
+++ head/net/nss-pam-ldapd/Makefile	Tue Jan 22 07:26:38 2013	(r310808)
@@ -1,14 +1,9 @@
-# Ports collection Makefile for:	nss_ldapd
-# Date created:				23/7/2009
-# Whom:					melifaro@ipfw.ru
-#
+# Created by: melifaro@ipfw.ru
 # $FreeBSD$
-#
-# vim: ft=pmake tw=78 fo=cq
-#
 
 PORTNAME=		nss-pam-ldapd
 PORTVERSION=		0.8.12
+PORTREVISION=	1
 CATEGORIES=		net
 MASTER_SITES=		http://arthurdejong.org/nss-pam-ldapd/
 
@@ -101,20 +96,16 @@ SUB_LIST+=		NSS_MESSAGE=""
 # 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 ${PORT_OPTIONS:MNSLCD)
+.if defined(WITHOUT_NSLCD)
+CONFIGURE_ARGS+=	--disable-nslcd
+PLIST_SUB+=		NSLCD="@comment "
+.else
 CONFIGURE_ARGS+=	--enable-nslcd
 PLIST_SUB+=		NSLCD=""
 MAN5+=			nslcd.conf.5
 MAN8+=			nslcd.8
-.else
-CONFIGURE_ARGS+=	--disable-nslcd
-PLIST_SUB+=		NSLCD="@comment "
 .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
 
_______________________________________________
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 7 Jason Helfman freebsd_committer freebsd_triage 2013-01-22 07:27:00 UTC
State Changed
From-To: feedback->closed

Committed, with minor changes. Thanks!