summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2018-09-16 01:16:20 +0300
committerAlon Bar-Lev <alonbl@gentoo.org>2018-09-16 01:21:01 +0300
commited3f7accadd7fbd5c529ea68793fad723eccc31f (patch)
tree08745474de2513084228cf6c6dd4d59c2cee04f1
parentsci-geosciences/routino: fix a stupid typo (diff)
downloadgentoo-ed3f7accadd7fbd5c529ea68793fad723eccc31f.tar.gz
gentoo-ed3f7accadd7fbd5c529ea68793fad723eccc31f.tar.bz2
gentoo-ed3f7accadd7fbd5c529ea68793fad723eccc31f.zip
app-crypt/tpm-emulator: version bump
Closes: https://bugs.gentoo.org/show_bug.cgi?id=537544 Closes: https://bugs.gentoo.org/show_bug.cgi?id=540384 Package-Manager: Portage-2.3.40, Repoman-2.3.9
-rw-r--r--app-crypt/tpm-emulator/Manifest1
-rw-r--r--app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch120
-rw-r--r--app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild (renamed from app-crypt/tpm-emulator/tpm-emulator-0.7.4-r2.ebuild)13
3 files changed, 4 insertions, 130 deletions
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 555e9753a5a..ee01c035b31 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1 +1,2 @@
+DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
DIST tpm_emulator-0.7.4.tar.gz 214145 BLAKE2B b8bbd53ecfb90e87f1306c03d2c65a472819d23d10bd63fa966bfadef4776c3876c2f6fc03cc878ece670bdfcd22c9f403ef4bc7f4593a0a6c7f8d17051ac3ba SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
deleted file mode 100644
index 7fd775139b2..00000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator-0.7.4-cmake.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-
-Pull request:
-https://github.com/PeterHuewe/tpm-emulator/pull/37
-
-
-From 694b7c24ac09e0ec1e54ab71eb9c82a8d4f41d33 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 14:08:49 +0300
-Subject: [PATCH 1/3] build: use GNUInstallDirs to allow override install
- directories
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- CMakeLists.txt | 1 +
- tddl/CMakeLists.txt | 6 +++---
- tpmd/unix/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f362298..d047ce3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@
- project(TPM_Emulator C)
-
- cmake_minimum_required(VERSION 2.4)
-+include(GNUInstallDirs)
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
- if(COMMAND cmake_policy)
- cmake_policy(SET CMP0003 NEW)
-diff --git a/tddl/CMakeLists.txt b/tddl/CMakeLists.txt
-index 0be3281..6cc63b3 100644
---- a/tddl/CMakeLists.txt
-+++ b/tddl/CMakeLists.txt
-@@ -15,9 +15,9 @@ elseif(WIN32)
- set_target_properties(tddl PROPERTIES PREFIX "")
- endif()
-
--install(TARGETS tddl DESTINATION lib)
--install(TARGETS tddl_static DESTINATION lib)
--install(FILES "tddl.h" DESTINATION include)
-+install(TARGETS tddl DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(TARGETS tddl_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES "tddl.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- add_executable(test_tddl test_tddl.c)
-diff --git a/tpmd/unix/CMakeLists.txt b/tpmd/unix/CMakeLists.txt
-index 40c436b..c5c394a 100644
---- a/tpmd/unix/CMakeLists.txt
-+++ b/tpmd/unix/CMakeLists.txt
-@@ -13,5 +13,5 @@ target_link_libraries(tpmd mtm tpm tpm_crypto)
- else()
- target_link_libraries(tpmd tpm tpm_crypto)
- endif()
--install(TARGETS tpmd RUNTIME DESTINATION bin)
-+install(TARGETS tpmd RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
---
-2.16.4
-
-From 89bf733368dda265040cf44ff8be69a15ab66712 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 16:36:12 +0300
-Subject: [PATCH 2/3] build: do not build mtm unless enabled
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d047ce3..b8b68a3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,7 +67,9 @@ include_directories(${CMAKE_BINARY_DIR})
-
- # add internal libraries
- add_subdirectory(tpm)
--add_subdirectory(mtm)
-+if(MTM_EMULATOR)
-+ add_subdirectory(mtm)
-+endif()
- add_subdirectory(crypto)
-
- # add TDDL
---
-2.16.4
-
-From 24bbf683de0b0b24f0ec81d093c03e1f6a9570f2 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 11 Sep 2018 14:20:19 +0300
-Subject: [PATCH 3/3] build: support BUILD_DEV to disable device build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b8b68a3..9ae6562 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,7 +76,12 @@ add_subdirectory(crypto)
- add_subdirectory(tddl)
-
- # add kernel modules
--add_subdirectory(tpmd_dev)
-+if(NOT DEFINED BUILD_DEV)
-+ set(BUILD_DEV ON)
-+endif()
-+if(BUILD_DEV)
-+ add_subdirectory(tpmd_dev)
-+endif()
-
- # add executables
- add_subdirectory(tpmd)
---
-2.16.4
-
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r2.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
index 9c7003c115f..38f20de07c7 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r2.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.5.ebuild
@@ -3,12 +3,12 @@
EAPI=6
MODULES_OPTIONAL_USE="modules"
-inherit flag-o-matic user linux-mod cmake-utils udev
+inherit user linux-mod cmake-utils udev
MY_P=${P/-/_}
DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://sourceforge.net/projects/tpm-emulator.berlios/"
-SRC_URI="mirror://sourceforge/tpm-emulator/${MY_P}.tar.gz"
+HOMEPAGE="https://github.com/PeterHuewe/tpm-emulator"
+SRC_URI="https://github.com/PeterHuewe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -22,13 +22,6 @@ RDEPEND="ssl? (
DEPEND="${RDEPEND}
!ssl? ( dev-libs/gmp )"
-S=${WORKDIR}/${P/-/_}
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-cmake.patch"
-)
-
pkg_setup() {
enewgroup tss
enewuser tss -1 -1 /var/lib/tpm tss