From owner-svn-ports-head@FreeBSD.ORG Thu Jul 17 15:19:49 2014 Return-Path: Delivered-To: svn-ports-head@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 A5DE23D4; Thu, 17 Jul 2014 15:19: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 912112169; Thu, 17 Jul 2014 15:19: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 s6HFJnE3031338; Thu, 17 Jul 2014 15:19:49 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6HFJlCP031326; Thu, 17 Jul 2014 15:19:47 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201407171519.s6HFJlCP031326@svn.freebsd.org> From: Tijl Coosemans Date: Thu, 17 Jul 2014 15:19:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362154 - in head/security: gnutls3 opencryptoki openssl_tpm_engine pond tpm-tools tpmmanager trousers trousers/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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2014 15:19:49 -0000 Author: tijl Date: Thu Jul 17 15:19:47 2014 New Revision: 362154 URL: http://svnweb.freebsd.org/changeset/ports/362154 QAT: https://qat.redports.org/buildarchive/r362154/ Log: - Convert security/trousers to USES=libtool and bump dependent ports - Use standard USE_AUTOTOOLS - Add INSTALL_TARGET=install-strip - Drop PTHREAD_LIBS Modified: head/security/gnutls3/Makefile head/security/opencryptoki/Makefile head/security/openssl_tpm_engine/Makefile head/security/pond/Makefile head/security/tpm-tools/Makefile head/security/tpmmanager/Makefile head/security/trousers/Makefile head/security/trousers/files/extra-patch-src-tcsd-Makefile.am head/security/trousers/files/patch-src-tspi-Makefile.am head/security/trousers/pkg-plist Modified: head/security/gnutls3/Makefile ============================================================================== --- head/security/gnutls3/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/gnutls3/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -3,7 +3,7 @@ PORTNAME= gnutls PORTVERSION= 3.1.25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net MASTER_SITES= ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/ PKGNAMESUFFIX= ${GNUTLS_SUFFIX} Modified: head/security/opencryptoki/Makefile ============================================================================== --- head/security/opencryptoki/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/opencryptoki/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -3,7 +3,7 @@ PORTNAME= opencryptoki PORTVERSION= 2.3.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} Modified: head/security/openssl_tpm_engine/Makefile ============================================================================== --- head/security/openssl_tpm_engine/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/openssl_tpm_engine/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -3,7 +3,7 @@ PORTNAME= openssl_tpm_engine PORTVERSION= 0.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= SF/trousers/OpenSSL%20TPM%20Engine/${PORTVERSION} Modified: head/security/pond/Makefile ============================================================================== --- head/security/pond/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/pond/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -2,6 +2,7 @@ PORTNAME= pond PORTVERSION= 20140120 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://c-s.li/ports/ DISTFILES= pond-20140120.tar.gz \ Modified: head/security/tpm-tools/Makefile ============================================================================== --- head/security/tpm-tools/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/tpm-tools/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -3,7 +3,7 @@ PORTNAME= tpm-tools PORTVERSION= 1.3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SF/trousers/${PORTNAME}/${PORTVERSION} Modified: head/security/tpmmanager/Makefile ============================================================================== --- head/security/tpmmanager/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/tpmmanager/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -3,6 +3,7 @@ PORTNAME= tpmmanager PORTVERSION= 0.8.1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/\.1//}/ Modified: head/security/trousers/Makefile ============================================================================== --- head/security/trousers/Makefile Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/trousers/Makefile Thu Jul 17 15:19:47 2014 (r362154) @@ -3,7 +3,7 @@ PORTNAME= trousers PORTVERSION= 0.3.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} @@ -15,16 +15,18 @@ LICENSE_NAME= Common Public License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= gmake iconv pkgconfig +USES= gmake iconv libtool pkgconfig USE_OPENSSL= YES USE_LDCONFIG= YES -USE_AUTOTOOLS= autoconf automake libtool +USE_AUTOTOOLS= libtoolize aclocal autoconf automake +AUTOMAKE_ARGS= -a -c -f USE_RC_SUBR= tcsd +INSTALL_TARGET= install-strip GNU_CONFIGURE= YES CONFIGURE_ARGS= --with-gui=none --enable-static \ --localstatedir=${PREFIX}/var \ --with-tssuser=${USERS} --with-tssgroup=${GROUPS} RANLIB=: -MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} ICONV_LIB=${ICONV_LIB} \ +MAKE_ENV= ICONV_LIB=${ICONV_LIB} \ ICONV_PREFIX=${ICONV_PREFIX} SUB_FILES= pkg-message SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} @@ -52,11 +54,6 @@ CONFLICTS+= tpm-emulator-[0-9]* PLIST_SUB+= TDDL="" .endif -run-autotools: run-autotools-autoreconf - -run-autotools-autoreconf: - @cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -i - post-install: ${INSTALL_DATA} \ ${WRKSRC}/dist/tcsd.conf ${STAGEDIR}${PREFIX}/etc/tcsd.conf.dist Modified: head/security/trousers/files/extra-patch-src-tcsd-Makefile.am ============================================================================== --- head/security/trousers/files/extra-patch-src-tcsd-Makefile.am Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/trousers/files/extra-patch-src-tcsd-Makefile.am Thu Jul 17 15:19:47 2014 (r362154) @@ -5,7 +5,7 @@ tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE -tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@ -+tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a -ltddl -L${LOCALBASE}/lib ${PTHREAD_LIBS} @CRYPTOLIB@ ++tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a -ltddl -L${LOCALBASE}/lib -lpthread @CRYPTOLIB@ tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c Modified: head/security/trousers/files/patch-src-tspi-Makefile.am ============================================================================== --- head/security/trousers/files/patch-src-tspi-Makefile.am Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/trousers/files/patch-src-tspi-Makefile.am Thu Jul 17 15:19:47 2014 (r362154) @@ -5,7 +5,7 @@ # 6. If any interfaces have been removed since the last public release, then set age to 0. -libtspi_la_LDFLAGS=-version-info 3:0:2 -lpthread @CRYPTOLIB@ -+libtspi_la_LDFLAGS=-version-info 3:0:2 ${PTHREAD_LIBS} @CRYPTOLIB@ -L${ICONV_PREFIX}/lib ${ICONV_LIB} ++libtspi_la_LDFLAGS=-version-info 3:0:2 -lpthread @CRYPTOLIB@ -L${ICONV_PREFIX}/lib ${ICONV_LIB} libtspi_la_CFLAGS=-I$(top_srcdir)/src/include -DAPPID=\"TSPI\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" Modified: head/security/trousers/pkg-plist ============================================================================== --- head/security/trousers/pkg-plist Thu Jul 17 15:07:22 2014 (r362153) +++ head/security/trousers/pkg-plist Thu Jul 17 15:19:47 2014 (r362154) @@ -25,9 +25,9 @@ include/tss/tss_structs.h include/tss/tss_typedef.h %%TDDL%%lib/libtddl.a lib/libtspi.a -lib/libtspi.la lib/libtspi.so -lib/libtspi.so.3 +lib/libtspi.so.1 +lib/libtspi.so.1.2.0 sbin/tcsd man/man3/Tspi_ChangeAuth.3.gz man/man3/Tspi_ChangeAuthAsym.3.gz