Bug 184183 - [PATCH] security/pam_yubico: update to 2.14 and fix ldap support
Summary: [PATCH] security/pam_yubico: update to 2.14 and fix ldap support
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: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-11-23 08:10 UTC by matt
Modified: 2013-11-30 17:30 UTC (History)
0 users

See Also:


Attachments
pam_yubico-2.14.diff (2.08 KB, patch)
2013-11-23 08:10 UTC, matt
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description matt 2013-11-23 08:10:00 UTC
	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.
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-11-30 16:53:07 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-11-30 17:26:38 UTC
Author: pawel
Date: Sat Nov 30 17:26:30 2013
New Revision: 335308
URL: http://svnweb.freebsd.org/changeset/ports/335308

Log:
  - Update to version 2.14
  - Fix LDAP support
  - Add STATIC option, builds static version of library
  - Update MASTER_SITES and WWW
  
  While I'm here:
  - Switch to new LIB_DEPENDS format
  - Use options helpers
  - Allow staging
  - Don't show pkg-message twice
  
  PR:             ports/184183
  Submitted by:   maintainer

Modified:
  head/security/pam_yubico/Makefile
  head/security/pam_yubico/distinfo
  head/security/pam_yubico/pkg-descr

Modified: head/security/pam_yubico/Makefile
==============================================================================
--- head/security/pam_yubico/Makefile	Sat Nov 30 17:26:04 2013	(r335307)
+++ head/security/pam_yubico/Makefile	Sat Nov 30 17:26:30 2013	(r335308)
@@ -1,62 +1,48 @@
 # $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@mjslabs.com
 COMMENT=	PAM module for authenticating with a Yubico YubiKey
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	ykclient:${PORTSDIR}/security/ykclient \
-		ykpers-1:${PORTSDIR}/security/ykpers \
-		yubikey:${PORTSDIR}/security/libyubikey
+LIB_DEPENDS=	libykclient.so:${PORTSDIR}/security/ykclient \
+		libykpers-1.so:${PORTSDIR}/security/ykpers \
+		libyubikey.so:${PORTSDIR}/security/libyubikey
 
 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
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+CR_CONFIGURE_WITH=	cr
+CR_PLIST_FILES=	bin/ykpamcfg \
+		man/man1/ykpamcfg.1.gz
+
+LDAP_CONFIGURE_WITH=	ldap
+LDAP_USE=	OPENLDAP=yes
+LDAP_LDFLAGS=	-L${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MCR}
-CONFIGURE_ARGS+=	--with-cr
-MAN1=		ykpamcfg.1
-PLIST_FILES+=	bin/ykpamcfg
-.else
-CONFIGURE_ARGS+=	--without-cr
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=	--with-ldap
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
+STATIC_CONFIGURE_ENABLE=	static
+STATIC_PLIST_FILES=	lib/security/pam_yubico.a
 
 regression-test: build
 	@(cd ${WRKSRC}; ${MAKE} check)
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/security/pam_yubico/distinfo
==============================================================================
--- head/security/pam_yubico/distinfo	Sat Nov 30 17:26:04 2013	(r335307)
+++ head/security/pam_yubico/distinfo	Sat Nov 30 17:26:30 2013	(r335308)
@@ -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

Modified: head/security/pam_yubico/pkg-descr
==============================================================================
--- head/security/pam_yubico/pkg-descr	Sat Nov 30 17:26:04 2013	(r335307)
+++ head/security/pam_yubico/pkg-descr	Sat Nov 30 17:26:30 2013	(r335308)
@@ -2,4 +2,4 @@ The Yubico authentication device Yubikey
 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/
_______________________________________________
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 3 Pawel Pekala freebsd_committer freebsd_triage 2013-11-30 17:26:45 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!