ports/184183: [PATCH] security/pam_yubico: update to 2.14 and fix ldap support

[Matt Stofko]

>Number:         184183
>Category:       ports
>Synopsis:       [PATCH] security/pam_yubico: update to 2.14 and fix ldap support
>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:   Sat Nov 23 08:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Matt Stofko
>Release:        FreeBSD 8.4-RELEASE-p4 amd64
>Organization:
mjslabs.com
>Environment:
System: FreeBSD phjeer.us 8.4-RELEASE-p4 FreeBSD 8.4-RELEASE-p4 #0 r255634: Tue Sep 17 14:34:12 PDT 2013 root at phjeer.us:/usr/obj/usr/src/sys/DAEMON amd64


	
>Description:
	Update the pam_yubico port to version 2.14.
	2.14 no longer installs the header files, so they have been removed from the PLIST.
	Fix a bug in the port Makefile where LDAP would silently be left out if openldap wasn't previously installed by hand.
	Add the ability to build a static library.
	Yubico has also moved the project off of Google Code, so have updated the URLs.

>How-To-Repeat:
	
>Fix:

	

--- pam_yubico-2.14.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 334633)
+++ Makefile	(working copy)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	pam_yubico
-PORTVERSION=	2.13
-PORTREVISION=	1
+PORTVERSION=	2.14
 CATEGORIES=	security
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://opensource.yubico.com/yubico-pam/releases/
 
 MAINTAINER=	matt at mjslabs.com
 COMMENT=	PAM module for authenticating with a Yubico YubiKey
@@ -18,17 +17,13 @@
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
 
-PLIST_FILES=	include/drop_privs.h \
-		include/util.h \
-		lib/security/pam_yubico.la \
+PLIST_FILES=	lib/security/pam_yubico.la \
 		lib/security/pam_yubico.so
 PLIST_DIRS=	lib/security
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 
-PROJECTHOST=	yubico-pam
-
-OPTIONS_DEFINE=	CR LDAP DOCS
+OPTIONS_DEFINE=	CR LDAP DOCS STATIC
 CR_DESC=	Include Challenge/response support
 OPTIONS_DEFAULT=	CR LDAP
 
@@ -44,11 +39,20 @@
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
+USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap
+LDFLAGS+=		-L${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=	--without-ldap
 .endif
 
+.if ${PORT_OPTIONS:MSTATIC}
+CONFIGURE_ARGS+=	--enable-static
+PLIST_FILES+=		lib/security/pam_yubico.a
+.else
+CONFIGURE_ARGS+=	--disable-static
+.endif
+
 regression-test: build
 	@(cd ${WRKSRC}; ${MAKE} check)
 
Index: distinfo
===================================================================
--- distinfo	(revision 334633)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pam_yubico-2.13.tar.gz) = 0d06294f82c3286397fe52044d4b9b8d96045c3f9939fc7bbf0b45c4463e89c0
-SIZE (pam_yubico-2.13.tar.gz) = 375151
+SHA256 (pam_yubico-2.14.tar.gz) = 77bf0bce4cf7aedcfe5e65d8ee4a5f191c0346a809952f87080bfe71ea3b0c32
+SIZE (pam_yubico-2.14.tar.gz) = 380023
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 334633)
+++ pkg-descr	(working copy)
@@ -2,4 +2,4 @@
 be used for authentication. This module allows you to use the Yubikey device to
 authenticate to the PAM system.
 
-WWW: https://code.google.com/p/yubico-pam/
+WWW: http://opensource.yubico.com/yubico-pam/
--- pam_yubico-2.14.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: