Date: Mon, 24 Jun 2013 11:55:42 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321677 - in head/security/duo: . files Message-ID: <201306241155.r5OBtgQj057667@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Mon Jun 24 11:55:42 2013 New Revision: 321677 URL: http://svnweb.freebsd.org/changeset/ports/321677 Log: - Update to 1.9.2 - Convert to new 'created by' header - Workaround build issue under 10.x PR: ports/179781 Submitted by: brooks@ Added: head/security/duo/files/patch-login__duo_Makefile.in (contents, props changed) head/security/duo/files/patch-pam__duo_Makefile.in (contents, props changed) Modified: head/security/duo/Makefile (contents, props changed) head/security/duo/distinfo (contents, props changed) head/security/duo/files/pkg-message.in (contents, props changed) head/security/duo/pkg-plist (contents, props changed) Modified: head/security/duo/Makefile ============================================================================== --- head/security/duo/Makefile Mon Jun 24 11:50:20 2013 (r321676) +++ head/security/duo/Makefile Mon Jun 24 11:55:42 2013 (r321677) @@ -1,14 +1,10 @@ -# New ports collection makefile for: duo -# Date created: 17 Jul 2011 -# Whom: Ryan Steinmetz <zi@FreeBSD.org> -# +# Created by: Ryan Steinmetz <zi@FreeBSD.org> # $FreeBSD$ -# PORTNAME= duo -PORTVERSION= 1.9 +PORTVERSION= 1.9.2 CATEGORIES= security -MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}security/${PORTNAME}_unix/ \ +MASTER_SITES= https://dl.duosecurity.com/ \ http://mirrors.rit.edu/zi/ DISTNAME= ${PORTNAME}_unix-${PORTVERSION} @@ -17,9 +13,7 @@ COMMENT= Duo unix integration package LICENSE= GPLv2 -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl - -CONFIGURE_ARGS= --with-pam=${PREFIX}/lib/security --sysconfdir=${ETCDIR} \ +CONFIGURE_ARGS= --with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \ --docdir=${DOCSDIR} GNU_CONFIGURE= yes @@ -29,14 +23,34 @@ SUB_FILES= pkg-message MAN3= duo.3 MAN8= login_duo.8 pam_duo.8 +OPTIONS= DOCS + +.include <bsd.port.options.mk> + +.if ${OSVERSION} >= 1000000 +USE_GCC= yes +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/login_duo/login_duo.8 @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pam_duo/pam_duo.8 -.if defined(NOPORTDOCS) +.if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|README AUTHORS CHANGES LICENSE||g' ${WRKSRC}/Makefile.in .endif post-install: + @${INSTALL} -o sshd -g wheel -m 700 ${WRKSRC}/login_duo/login_duo.conf \ + ${PREFIX}/etc/login_duo.conf.sample + @${INSTALL_DATA} -m 700 ${WRKSRC}/pam_duo/pam_duo.conf \ + ${PREFIX}/etc/pam_duo.conf.sample + @if [ ! -f ${PREFIX}/etc/login_duo.conf ]; then \ + ${CP} -p ${PREFIX}/etc/login_duo.conf.sample \ + ${PREFIX}/etc/login_duo.conf ; \ + fi + @if [ ! -f ${PREFIX}/etc/pam_duo.conf ]; then \ + ${CP} -p ${PREFIX}/etc/pam_duo.conf.sample \ + ${PREFIX}/etc/pam_duo.conf ; \ + fi @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> Modified: head/security/duo/distinfo ============================================================================== --- head/security/duo/distinfo Mon Jun 24 11:50:20 2013 (r321676) +++ head/security/duo/distinfo Mon Jun 24 11:55:42 2013 (r321677) @@ -1,2 +1,2 @@ -SHA256 (duo_unix-1.9.tar.gz) = 92121c2f0d06babc17a70a71aa272d24c035522136304758f2357c79b67b3061 -SIZE (duo_unix-1.9.tar.gz) = 444818 +SHA256 (duo_unix-1.9.2.tar.gz) = a8d37d3fc99b840144d2b55d4f603d32b344c0f7b8022b25c9d50c155fe7f50a +SIZE (duo_unix-1.9.2.tar.gz) = 434788 Added: head/security/duo/files/patch-login__duo_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/duo/files/patch-login__duo_Makefile.in Mon Jun 24 11:55:42 2013 (r321677) @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- login_duo/Makefile.in.orig ++++ login_duo/Makefile.in +@@ -607,16 +607,6 @@ + chmod 4755 $(DESTDIR)$(sbindir)/login_duo + + install-data-local: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir) +- -@if [ ! -f $(DESTDIR)$(sysconfdir)/login_duo.conf ]; then \ +- cp login_duo.conf $(DESTDIR)$(sysconfdir)/login_duo.conf; \ +- echo "Created ${DESTDIR}$(sysconfdir)/login_duo.conf"; \ +- echo "Please edit it to add your Duo integration and secret keys"; \ +- else \ +- echo "Found existing ${DESTDIR}$(sysconfdir)/login_duo.conf - updating permissions"; \ +- fi +- -chown $(DUO_PRIVSEP_USER) $(DESTDIR)$(sysconfdir)/login_duo.conf +- -chmod 600 $(DESTDIR)$(sysconfdir)/login_duo.conf + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Added: head/security/duo/files/patch-pam__duo_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/duo/files/patch-pam__duo_Makefile.in Mon Jun 24 11:55:42 2013 (r321677) @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- pam_duo/Makefile.in.orig ++++ pam_duo/Makefile.in +@@ -595,17 +595,7 @@ + tags uninstall uninstall-am uninstall-man uninstall-man8 \ + uninstall-pam_libLTLIBRARIES + +- + install-data-local: +- $(MKDIR_P) $(DESTDIR)$(sysconfdir) +- -@if [ ! -f $(DESTDIR)$(sysconfdir)/pam_duo.conf ]; then \ +- cp pam_duo.conf $(DESTDIR)$(sysconfdir)/pam_duo.conf; \ +- echo "Created ${DESTDIR}$(sysconfdir)/pam_duo.conf"; \ +- echo "Please edit it to add your Duo integration and secret keys"; \ +- else \ +- echo "Found existing ${DESTDIR}$(sysconfdir)/pam_duo.conf - updating permissions"; \ +- fi +- -chmod 600 $(DESTDIR)$(sysconfdir)/pam_duo.conf + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. Modified: head/security/duo/files/pkg-message.in ============================================================================== --- head/security/duo/files/pkg-message.in Mon Jun 24 11:50:20 2013 (r321676) +++ head/security/duo/files/pkg-message.in Mon Jun 24 11:55:42 2013 (r321677) @@ -1,12 +1,12 @@ ================================================================= -Configuration file %%ETCDIR%%/login_duo.conf was created. +Configuration file %%PREFIX%%/etc/login_duo.conf was created. You must edit it to add your Duo integration and secret keys. If you are using the PAM module, a line similar to the following should be added to your service(s) of choice in /etc/pam.d: auth required %%PREFIX%%/lib/security/pam_duo.so -Additionally, you must edit %%ETCDIR%%/pam_duo.conf +Additionally, you must edit %%PREFIX%%/etc/pam_duo.conf ================================================================= Modified: head/security/duo/pkg-plist ============================================================================== --- head/security/duo/pkg-plist Mon Jun 24 11:50:20 2013 (r321676) +++ head/security/duo/pkg-plist Mon Jun 24 11:55:42 2013 (r321677) @@ -1,5 +1,9 @@ -%%ETCDIR%%/login_duo.conf -%%ETCDIR%%/pam_duo.conf +@unexec if cmp -s %D/etc/login_duo.conf.sample %D/etc/login_duo.conf; then rm -f %D/etc/login_duo.conf; fi +etc/login_duo.conf.sample +@exec if [ ! -f %D/etc/login_duo.conf ] ; then cp -p %D/%F %B/login_duo.conf; fi +@unexec if cmp -s %D/etc/pam_duo.conf.sample %D/etc/pam_duo.conf; then rm -f %D/etc/pam_duo.conf; fi +etc/pam_duo.conf.sample +@exec if [ ! -f %D/etc/pam_duo.conf ] ; then cp -p %D/%F %B/pam_duo.conf; fi include/duo.h lib/libduo.so.3 lib/libduo.so @@ -15,4 +19,3 @@ lib/security/pam_duo.la %%PORTDOCS%%@dirrm %%DOCSDIR%% sbin/login_duo @dirrmtry lib/security -@dirrmtry %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306241155.r5OBtgQj057667>