[patch] swtpm ebuild and files

0001-app-crypt-swtpm-inital-commit.patch (text/plain), 7.37 KB, created by Christopher Byrne on 2019-01-22 07:03:20 UTC

From 2d37420822bf00c69c0753bf741f8ebce0a43dfd Mon Sep 17 00:00:00 2001
From: Christopher Byrne <[e-mail]>
Date: Sat, 12 Jan 2019 18:03:45 -0600
Subject: [PATCH] app-crypt/swtpm: inital commit

Signed-off-by: Christopher Byrne <[e-mail]>
---
 ...tpm-0.1.0_p20181212-fix-localca-path.patch | 16 ++++++
 .../files/swtpm-9999-fix-localca-path.patch   | 29 ++++++++++
 .../swtpm-disable-test-dependencies.patch     | 43 +++++++++++++++
 app-crypt/swtpm/swtpm-0.1.0_p20181212.ebuild  | 53 +++++++++++++++++++
 app-crypt/swtpm/swtpm-9999.ebuild             | 52 ++++++++++++++++++
 5 files changed, 193 insertions(+)
 create mode 100644 app-crypt/swtpm/files/swtpm-0.1.0_p20181212-fix-localca-path.patch
 create mode 100644 app-crypt/swtpm/files/swtpm-9999-fix-localca-path.patch
 create mode 100644 app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
 create mode 100644 app-crypt/swtpm/swtpm-0.1.0_p20181212.ebuild
 create mode 100644 app-crypt/swtpm/swtpm-9999.ebuild

diff --git a/app-crypt/swtpm/files/swtpm-0.1.0_p20181212-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.1.0_p20181212-fix-localca-path.patch
new file mode 100644
index 00000000000..d6ce934f908
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.1.0_p20181212-fix-localca-path.patch
@@ -0,0 +1,16 @@
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index 4558d66..6fc6d77 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -16,9 +16,9 @@ samplessysconf_DATA = \
+ 	swtpm-localca.options
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
++	$(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca
+ 	if test -z $(DESTDIR); then \
+-		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
++		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
+ 	fi
+ 
+ EXTRA_DIST= \
diff --git a/app-crypt/swtpm/files/swtpm-9999-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-9999-fix-localca-path.patch
new file mode 100644
index 00000000000..c83758da563
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-9999-fix-localca-path.patch
@@ -0,0 +1,29 @@
+diff --git a/samples/Makefile.am b/samples/Makefile.am
+index 4558d66..6fc6d77 100644
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
+@@ -16,9 +16,9 @@ samplessysconf_DATA = \
+ 	swtpm-localca.options
+ 
+ install-data-local:
+-	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
++	$(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca
+ 	if test -z $(DESTDIR); then \
+-		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
++		chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
+ 	fi
+ 
+ EXTRA_DIST= \
+diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
+index 1f0b48d..63f1fed 100644
+--- a/samples/swtpm-localca.conf.in
++++ b/samples/swtpm-localca.conf.in
+@@ -1,4 +1,4 @@
+-statedir = @LOCALSTATEDIR@/lib/swtpm-localca
+-signingkey = @LOCALSTATEDIR@/lib/swtpm-localca/signkey.pem
+-issuercert = @LOCALSTATEDIR@/lib/swtpm-localca/issuercert.pem
+-certserial = @LOCALSTATEDIR@/lib/swtpm-localca/certserial
++statedir = @LOCALSTATEDIR@/swtpm-localca
++signingkey = @LOCALSTATEDIR@/swtpm-localca/signkey.pem
++issuercert = @LOCALSTATEDIR@/swtpm-localca/issuercert.pem
++certserial = @LOCALSTATEDIR@/swtpm-localca/certserial
diff --git a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
new file mode 100644
index 00000000000..009ce3fd8eb
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
@@ -0,0 +1,43 @@
+diff --git a/Makefile.am b/Makefile.am
+index 47b091a..8380e7c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,8 +9,7 @@ SUBDIRS   = \
+ 	include \
+ 	man \
+ 	samples \
+-	src \
+-	tests
++	src
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+diff --git a/configure.ac b/configure.ac
+index 1f6d7df..2324f21 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -322,15 +322,15 @@ if test "x$GAWK" = "x"; then
+ 	AC_MSG_ERROR([gawk is required: gawk package])
+ fi
+ 
+-AC_PATH_PROG([SOCAT], socat)
+-if test "x$SOCAT" = "x"; then
+-	AC_MSG_ERROR([socat is required: socat package])
+-fi
+-
+-AC_PATH_PROG([PYTHON], python3)
+-if test "x$PYTHON" = "x"; then
+-	AC_MSG_ERROR([python3 is required])
+-fi
++dnl AC_PATH_PROG([SOCAT], socat)
++dnl if test "x$SOCAT" = "x"; then
++dnl 	AC_MSG_ERROR([socat is required: socat package])
++dnl fi
++
++dnl AC_PATH_PROG([PYTHON], python3)
++dnl if test "x$PYTHON" = "x"; then
++dnl	AC_MSG_ERROR([python3 is required])
++dnl fi
+ 
+ AC_ARG_ENABLE([hardening],
+   AS_HELP_STRING([--disable-hardening], [Disable hardening flags]))
diff --git a/app-crypt/swtpm/swtpm-0.1.0_p20181212.ebuild b/app-crypt/swtpm/swtpm-0.1.0_p20181212.ebuild
new file mode 100644
index 00000000000..2751b961538
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-0.1.0_p20181212.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit git-r3 autotools python-any-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+EGIT_REPO_URI="https://github.com/stefanberger/swtpm.git"
+EGIT_COMMIT="8b9484a35063a9a07c93051b2dae0b69d9d9676e"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gnutls fuse test"
+
+DEPEND="dev-libs/libtpms
+	dev-libs/openssl:0
+	dev-libs/libtasn1
+	fuse? ( sys-fs/fuse:0
+		 >=dev-libs/glib-2.0.0 )
+	gnutls? ( >=net-libs/gnutls-3.1.0[tools] )
+	test? ( net-misc/socat
+		${PYTHON_DEPS} )"
+
+RDEPEND="dev-tcltk/expect
+	app-crypt/trousers
+	app-crypt/tpm-tools
+	sys-apps/gawk
+	${DEPEND}"
+
+src_prepare() {
+	use !test && eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
+	eapply "${FILESDIR}/${P}-fix-localca-path.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	  --with-openssl \
+	  --without-selinux \
+	  $(use_with gnutls) \
+	  $(use_with fuse cuse)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	fowners tss: /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+}
diff --git a/app-crypt/swtpm/swtpm-9999.ebuild b/app-crypt/swtpm/swtpm-9999.ebuild
new file mode 100644
index 00000000000..4d534da73fe
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit git-r3 autotools python-any-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+EGIT_REPO_URI="https://github.com/stefanberger/swtpm.git"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="gnutls fuse test"
+
+DEPEND="dev-libs/libtpms
+	dev-libs/openssl:0
+	dev-libs/libtasn1
+	fuse? ( sys-fs/fuse:0
+		 >=dev-libs/glib-2.0.0 )
+	gnutls? ( >=net-libs/gnutls-3.1.0[tools] )
+	test? ( net-misc/socat
+		${PYTHON_DEPS} )"
+
+RDEPEND="dev-tcltk/expect
+	app-crypt/trousers
+	app-crypt/tpm-tools
+	sys-apps/gawk
+	${DEPEND}"
+
+src_prepare() {
+	use !test && eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
+	eapply "${FILESDIR}/${P}-fix-localca-path.patch"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+	  --with-openssl \
+	  --without-selinux \
+	  $(use_with gnutls) \
+	  $(use_with fuse cuse)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	fowners tss: /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+}
-- 
2.19.2