From owner-svn-ports-all@FreeBSD.ORG Thu Jul 3 16:16:49 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D848B981; Thu, 3 Jul 2014 16:16:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C53B42A38; Thu, 3 Jul 2014 16:16:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63GGn92039483; Thu, 3 Jul 2014 16:16:49 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63GGnTr039481; Thu, 3 Jul 2014 16:16:49 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201407031616.s63GGnTr039481@svn.freebsd.org> From: "Jason E. Hale" Date: Thu, 3 Jul 2014 16:16:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360401 - in head/security/duo: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 16:16:50 -0000 Author: jhale Date: Thu Jul 3 16:16:49 2014 New Revision: 360401 URL: http://svnweb.freebsd.org/changeset/ports/360401 QAT: https://qat.redports.org/buildarchive/r360401/ Log: - Fix perms/owner of config files - USES=pathfix instead of patches - USES=libtool, drop .la files - Remove PORTDOCS hack - Remove USE_GCC, it builds fine with clang PR: 191580 (based on) Submitted by: Ben Approved by: zi (maintainer) Deleted: head/security/duo/files/patch-lib__Makefile.am head/security/duo/files/patch-lib__Makefile.in Modified: head/security/duo/Makefile head/security/duo/pkg-plist Modified: head/security/duo/Makefile ============================================================================== --- head/security/duo/Makefile Thu Jul 3 16:15:20 2014 (r360400) +++ head/security/duo/Makefile Thu Jul 3 16:16:49 2014 (r360401) @@ -16,39 +16,23 @@ LICENSE= GPLv2 CONFIGURE_ARGS= --with-pam=${PREFIX}/lib/security --sysconfdir=${PREFIX}/etc \ --docdir=${DOCSDIR} --includedir=${PREFIX}/include/${PORTNAME} +USES= libtool pathfix GNU_CONFIGURE= yes USE_LDCONFIG= yes SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS -.include - -.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 !${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e 's|README AUTHORS CHANGES LICENSE||g' ${WRKSRC}/Makefile.in -.endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libduo.so.3 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_duo.so - @${INSTALL} -o sshd -g wheel -m 700 ${WRKSRC}/login_duo/login_duo.conf \ + ${INSTALL_DATA} ${WRKSRC}/login_duo/login_duo.conf \ ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample - @${INSTALL_DATA} -m 700 ${WRKSRC}/pam_duo/pam_duo.conf \ + ${INSTALL_DATA} ${WRKSRC}/pam_duo/pam_duo.conf \ ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample - @if [ ! -f ${PREFIX}/etc/login_duo.conf ]; then \ - ${CP} -p ${STAGEDIR}${PREFIX}/etc/login_duo.conf.sample \ - ${STAGEDIR}${PREFIX}/etc/login_duo.conf ; \ - fi - @if [ ! -f ${PREFIX}/etc/pam_duo.conf ]; then \ - ${CP} -p ${STAGEDIR}${PREFIX}/etc/pam_duo.conf.sample \ - ${STAGEDIR}${PREFIX}/etc/pam_duo.conf ; \ - fi .include Modified: head/security/duo/pkg-plist ============================================================================== --- head/security/duo/pkg-plist Thu Jul 3 16:15:20 2014 (r360400) +++ head/security/duo/pkg-plist Thu Jul 3 16:16:49 2014 (r360401) @@ -1,18 +1,17 @@ -@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 +@mode 600 +@owner sshd +@sample etc/login_duo.conf.sample +@owner +@sample etc/pam_duo.conf.sample +@mode include/duo/duo.h include/duo/util.h +lib/libduo.so.3.0.0 lib/libduo.so.3 lib/libduo.so -lib/libduo.la lib/libduo.a libdata/pkgconfig/libduo.pc lib/security/pam_duo.so -lib/security/pam_duo.la man/man3/duo.3.gz man/man8/login_duo.8.gz man/man8/pam_duo.8.gz