svn commit: r311846 - in head/emulators/tpm-emulator: . files

Martin Wilke miwi at FreeBSD.org
Thu Feb 7 14:30:50 UTC 2013 

Author: miwi
Date: Thu Feb  7 14:30:48 2013
New Revision: 311846
URL: http://svnweb.freebsd.org/changeset/ports/311846

Log:
  - Update to version 0.7.4
  - Trim header
  
  PR:		172716
  Submitted by:	Ports Fury

Deleted:
  head/emulators/tpm-emulator/files/patch-mtm-mtm_structures.h
  head/emulators/tpm-emulator/files/patch-tpm-tpm_ticks.c
  head/emulators/tpm-emulator/files/patch-tpmd_dev-CMakeLists.txt
  head/emulators/tpm-emulator/files/patch-tpmd_dev-openbsd-Makefile
  head/emulators/tpm-emulator/files/patch-tpmd_dev-openbsd-tpmd_dev.c
  head/emulators/tpm-emulator/files/patch-tpmd_dev-openbsd-tpmd_dev.h
Modified:
  head/emulators/tpm-emulator/Makefile
  head/emulators/tpm-emulator/distinfo   (contents, props changed)
  head/emulators/tpm-emulator/files/patch-CMakeLists.txt   (contents, props changed)
  head/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt   (contents, props changed)
  head/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt   (contents, props changed)
  head/emulators/tpm-emulator/pkg-descr   (contents, props changed)
  head/emulators/tpm-emulator/pkg-plist   (contents, props changed)

Modified: head/emulators/tpm-emulator/Makefile
==============================================================================
--- head/emulators/tpm-emulator/Makefile	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/Makefile	Thu Feb  7 14:30:48 2013	(r311846)
@@ -1,55 +1,45 @@
-# New ports collection makefile for:	tpm-emulator
-# Date created:				18 Sep 2007
-# Whom:					Sebastian Schuetz <sschuetz at fhm.edu>
-#
+# Created by: Sebastian Schuetz <sschuetz at fhm.edu>
 # $FreeBSD$
-#
 
-PORTNAME=		tpm-emulator
-PORTVERSION=		0.7.1
-PORTREVISION=		1
-CATEGORIES=		emulators security
-MASTER_SITES=		BERLIOS/${PORTNAME}
-DISTNAME=		${PORTNAME:S/-/_/}-${PORTVERSION}
+PORTNAME=	tpm-emulator
+PORTVERSION=	0.7.4
+CATEGORIES=	emulators security
+#MASTER_SITES=	BERLIOS
+MASTER_SITES=	SF/${PORTNAME}.berlios
+DISTNAME=	${PORTNAME:S,-,_,}-${PORTVERSION}
 
-MAINTAINER=		ports at FreeBSD.org
-COMMENT=		Trusted Platform Module (TPM) emulator
+MAINTAINER=	ports at FreeBSD.org
+COMMENT=	Trusted Platform Module (TPM) emulator
 
-LIB_DEPENDS=		gmp.10:${PORTSDIR}/math/gmp
+LICENSE=	GPLv2
 
-USE_CMAKE=		YES
-USE_RC_SUBR=		tpmd
-USE_LDCONFIG=		YES
-MAKE_JOBS_SAFE=		YES
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp
 
-CONFLICTS=		trousers-tddl-[0-9d]*
+CONFLICTS=	trousers-tddl-[0-9d]*
 
-WANTLIB=		c
-CMAKE_VERBOSE=		YES
-CMAKE_SOURCE_PATH=	${WRKSRC}
-BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=		${CONFIGURE_WRKSRC}
-CONFIGURE_WRKSRC=	${CMAKE_SOURCE_PATH}/build
+USE_RC_SUBR=	tpmd
 
-CMAKE_ENV=		PREFIX=${PREFIX} ${CONFIGURE_ENV}
-CMAKE_ARGS=		-DCMAKE_INCLUDE_PATH="${LOCALBASE}/include"
-LDFLAGS+=		-L${LOCALBASE}/lib
+USE_CMAKE=	yes
+CMAKE_OUTSOURCE=yes
+CMAKE_ENV=	PREFIX="${PREFIX}"
+CMAKE_ARGS=	-DTPM_INCLUDE_DIRS:STRING="${LOCALBASE}/include" \
+		-DTPM_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
-SUB_LIST=		USERS=${USERS} GROUPS=${GROUPS}
+USERS=		_tss
+GROUPS=		_tss
 
-USERS=			_tss
-GROUPS=			_tss
+SUB_LIST=	USERS="${USERS}" GROUPS="${GROUPS}"
 
-LICENSE=		GPLv2
-LICENSE_FILE=		${WRKSRC}/README
-
-WRKSRC=			${WRKDIR}/${DISTNAME}
+.include <bsd.port.pre.mk>
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/build
+.if ${ARCH} == "powerpc"
+BROKEN=		Does not compile on powerpc
+.endif
 
 post-install:
-	@${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 ${PREFIX}/var/lib/tpm
+	@${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 ${PREFIX}/var/db/tpm
 	@${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700          /var/run/tpm
 
 add-plist-post:
@@ -57,10 +47,4 @@ add-plist-post:
 	@${ECHO_CMD} "@unexec ${RMDIR} var/run/tpm 2>/dev/null || true"			>> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/tpm"	>> ${TMPPLIST}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc
-.endif
-
 .include <bsd.port.post.mk>

Modified: head/emulators/tpm-emulator/distinfo
==============================================================================
--- head/emulators/tpm-emulator/distinfo	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/distinfo	Thu Feb  7 14:30:48 2013	(r311846)
@@ -1,2 +1,2 @@
-SHA256 (tpm_emulator-0.7.1.tar.gz) = 7c10a753206bf0f32a767dc69039a866bd8d3eb8a4834f5e722c7510a9f54c24
-SIZE (tpm_emulator-0.7.1.tar.gz) = 207497
+SHA256 (tpm_emulator-0.7.4.tar.gz) = 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459
+SIZE (tpm_emulator-0.7.4.tar.gz) = 214145

Modified: head/emulators/tpm-emulator/files/patch-CMakeLists.txt
==============================================================================
--- head/emulators/tpm-emulator/files/patch-CMakeLists.txt	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/files/patch-CMakeLists.txt	Thu Feb  7 14:30:48 2013	(r311846)
@@ -1,24 +1,26 @@
 --- CMakeLists.txt.orig	2010-07-06 06:21:20.000000000 +0900
 +++ CMakeLists.txt	2010-12-15 07:33:54.234887143 +0900
-@@ -32,11 +32,11 @@
+@@ -36,19 +36,19 @@
  else()
  set(TPM_LOG_FILE "/var/log/tpmd.log")
  set(TPM_SOCKET_NAME "/var/run/tpm/tpmd_socket:0")
 -set(TPM_STORAGE_NAME "/var/lib/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}")
-+set(TPM_STORAGE_NAME "$ENV{PREFIX}/var/lib/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}")
++set(TPM_STORAGE_NAME "$ENV{PREFIX}/var/db/tpm/tpm_emulator-1_2_${${PROJECT_NAME}_VERSION_MAJOR}_${${PROJECT_NAME}_VERSION_MINOR}")
  set(TPM_DEVICE_NAME "/dev/tpm")
  endif()
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
--add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings)
-+add_definitions(-Wall -Werror -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings)
+-add_definitions(-Wall -Werror -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings)
++add_definitions(-Wall -Wno-unused-parameter -Wpointer-arith -Wcast-align -Wwrite-strings)
+ if("${CMAKE_SYSTEM}" MATCHES "Linux")
+     add_definitions(-Wextra)
+ endif()
+ if(USE_OPENSSL)
+     add_definitions(-DUSE_OPENSSL)
+ endif()
+-include_directories("/opt/local/include")
+-link_directories("/opt/local/lib")
++include_directories(${TPM_INCLUDE_DIRS})
++link_directories(${TPM_LIBRARY_DIRS})
  
  # configure CPack
  set(CPACK_PACKAGE_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR})
-@@ -51,6 +51,7 @@
- # include root directories
- include_directories(${CMAKE_SOURCE_DIR})
- include_directories(${CMAKE_BINARY_DIR})
-+include_directories(${CMAKE_INCLUDE_PATH})
- 
- # add internal libraries
- add_subdirectory(tpm)

Modified: head/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt
==============================================================================
--- head/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/files/patch-tddl-CMakeLists.txt	Thu Feb  7 14:30:48 2013	(r311846)
@@ -1,15 +1,13 @@
---- tddl/CMakeLists.txt.orig	2010-07-06 06:21:20.000000000 +0900
-+++ tddl/CMakeLists.txt	2010-12-11 04:00:11.868033375 +0900
-@@ -5,18 +5,21 @@
- 
- set(tddl_SRCS "tddl.c" "tddl.h")
+--- tddl/CMakeLists.txt.orig	2011-12-21 03:30:06.000000000 +0900
++++ tddl/CMakeLists.txt	2012-10-10 01:01:00.000000000 +0900
+@@ -7,13 +7,13 @@
  add_library(tddl SHARED ${tddl_SRCS})
-+add_library(tddlStatic STATIC ${tddl_SRCS})
+ add_library(tddl_static STATIC ${tddl_SRCS})
  if(UNIX)
 -  set_target_properties(tddl PROPERTIES SOVERSION "1.2"
 +  set_target_properties(tddl PROPERTIES SOVERSION "1"
      VERSION "1.2.${${PROJECT_NAME}_VERSION_MAJOR}.${${PROJECT_NAME}_VERSION_MINOR}")
-+  set_target_properties(tddlStatic PROPERTIES OUTPUT_NAME tddl)
+   set_target_properties(tddl_static PROPERTIES OUTPUT_NAME tddl)
  elseif(WIN32)
    set_target_properties(tddl PROPERTIES OUTPUT_NAME ifxtpm)
    set_target_properties(tddl PROPERTIES PREFIX "")
@@ -17,11 +15,4 @@
 +endif(UNIX)
  
  install(TARGETS tddl DESTINATION lib)
-+install(TARGETS tddlStatic DESTINATION lib)
- install(FILES "tddl.h" DESTINATION include)
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- add_executable(test_tddl test_tddl.c)
--target_link_libraries(test_tddl tddl)
-+target_link_libraries(test_tddl tddlStatic)
- 
+ install(TARGETS tddl_static DESTINATION lib)

Modified: head/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt
==============================================================================
--- head/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/files/patch-tpmd-unix-CMakeLists.txt	Thu Feb  7 14:30:48 2013	(r311846)
@@ -1,12 +1,12 @@
---- tpmd/unix/CMakeLists.txt.orig	2010-07-06 06:21:20.000000000 +0900
-+++ tpmd/unix/CMakeLists.txt	2010-10-25 02:56:43.633558246 +0900
+--- tpmd/unix/CMakeLists.txt.orig	2011-12-21 03:30:06.000000000 +0900
++++ tpmd/unix/CMakeLists.txt	2012-10-10 01:03:34.000000000 +0900
 @@ -10,8 +10,8 @@
  if(MTM_EMULATOR)
  add_definitions(-DMTM_EMULATOR)
- target_link_libraries(tpmd mtm tpm crypto)
+ target_link_libraries(tpmd mtm tpm tpm_crypto)
 -else()
 +else(MTM_EMULATOR)
- target_link_libraries(tpmd tpm crypto)
+ target_link_libraries(tpmd tpm tpm_crypto)
 -endif()
 +endif(MTM_EMULATOR)
  install(TARGETS tpmd RUNTIME DESTINATION bin)

Modified: head/emulators/tpm-emulator/pkg-descr
==============================================================================
--- head/emulators/tpm-emulator/pkg-descr	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/pkg-descr	Thu Feb  7 14:30:48 2013	(r311846)
@@ -1,4 +1,6 @@
 The project aims to create a fully working Trusted Platform Module (TPM)
-emulator follwing the specifications of the Trusted Computing Group.
-The port provides a driver library libtddl which can be linked against programs
+emulator follwing the specifications of the Trusted Computing Group. The
+port provides a driver library libtddl which can be linked against programs
 providing a Trusted Software Stack to redirect TPM calls to the emulator.
+
+WWW: http://tpm-emulator.berlios.de/

Modified: head/emulators/tpm-emulator/pkg-plist
==============================================================================
--- head/emulators/tpm-emulator/pkg-plist	Thu Feb  7 14:30:09 2013	(r311845)
+++ head/emulators/tpm-emulator/pkg-plist	Thu Feb  7 14:30:48 2013	(r311846)
@@ -4,4 +4,5 @@ lib/libtddl.a
 lib/libtddl.so
 lib/libtddl.so.1
 lib/libtddl.so.1.2.0.7
- at dirrmtry var/lib/tpm
+ at dirrmtry var/db/tpm
+ at dirrmtry var/db

More information about the svn-ports-head mailing list