Attachment #563466 for bug #675298

View | Details | Raw Unified | Return to bug 675298 | Differences between
Collapse All | Expand All




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/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




# 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 autotools python-any-r1

DESCRIPTION="Libtpms-based TPM emulator"
HOMEPAGE="https://github.com/stefanberger/swtpm"
SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="gnutls fuse test"

COMMON_DEPEND="dev-libs/libtpms
	dev-libs/openssl:0
	fuse? ( sys-fs/fuse:0
		 >=dev-libs/glib-2.0.0 )
	gnutls? ( >=net-libs/gnutls-3.1.0[tools]
		  dev-libs/libtasn1 )"

DEPEND="${COMMON_DEPEND}
	test? ( net-misc/socat
		${PYTHON_DEPS} )"

RDEPEND="${COMMON_DEPEND}
	dev-tcltk/expect
	app-crypt/trousers
	app-crypt/tpm-tools
	sys-apps/gawk"

src_prepare() {
	use !test && eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
	eapply "${FILESDIR}/${PN}-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
}




# 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"

COMMON_DEPEND="dev-libs/libtpms
	dev-libs/openssl:0
	fuse? ( sys-fs/fuse:0
		>=dev-libs/glib-2.0.0 )
	gnutls? ( >=net-libs/gnutls-3.1.0[tools]
		  dev-libs/libtasn1 )"

DEPEND="${COMMON_DEPEND}
	test? ( net-misc/socat
		${PYTHON_DEPS} )"

RDEPEND="${COMMON_DEPEND}
	dev-tcltk/expect
	app-crypt/trousers
	app-crypt/tpm-tools
	sys-apps/gawk"

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
}

Return to bug 675298

Line 0 Link Here

(-)a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch (+43 lines)
	1	diff --git a/Makefile.am b/Makefile.am
	2	index 47b091a..8380e7c 100644
	3	--- a/Makefile.am
	4	+++ b/Makefile.am
	5	@@ -9,8 +9,7 @@ SUBDIRS = \
	6	include \
	7	man \
	8	samples \
	9	- src \
	10	- tests
	11	+ src
	12
	13	ACLOCAL_AMFLAGS = -I m4
	14
	15	diff --git a/configure.ac b/configure.ac
	16	index 1f6d7df..2324f21 100644
	17	--- a/configure.ac
	18	+++ b/configure.ac
	19	@@ -322,15 +322,15 @@ if test "x$GAWK" = "x"; then
	20	AC_MSG_ERROR([gawk is required: gawk package])
	21	fi
	22
	23	-AC_PATH_PROG([SOCAT], socat)
	24	-if test "x$SOCAT" = "x"; then
	25	- AC_MSG_ERROR([socat is required: socat package])
	26	-fi
	27	-
	28	-AC_PATH_PROG([PYTHON], python3)
	29	-if test "x$PYTHON" = "x"; then
	30	- AC_MSG_ERROR([python3 is required])
	31	-fi
	32	+dnl AC_PATH_PROG([SOCAT], socat)
	33	+dnl if test "x$SOCAT" = "x"; then
	34	+dnl AC_MSG_ERROR([socat is required: socat package])
	35	+dnl fi
	36	+
	37	+dnl AC_PATH_PROG([PYTHON], python3)
	38	+dnl if test "x$PYTHON" = "x"; then
	39	+dnl AC_MSG_ERROR([python3 is required])
	40	+dnl fi
	41
	42	AC_ARG_ENABLE([hardening],
	43	AS_HELP_STRING([--disable-hardening], [Disable hardening flags]))

Line 0 Link Here

(-)a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch (+29 lines)
	1	diff --git a/samples/Makefile.am b/samples/Makefile.am
	2	index 4558d66..6fc6d77 100644
	3	--- a/samples/Makefile.am
	4	+++ b/samples/Makefile.am
	5	@@ -16,9 +16,9 @@ samplessysconf_DATA = \
	6	swtpm-localca.options
	7
	8	install-data-local:
	9	- $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca
	10	+ $(MKDIR_P) $(DESTDIR)$(localstatedir)/swtpm-localca
	11	if test -z $(DESTDIR); then \
	12	- chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/lib/swtpm-localca \|\| true; \
	13	+ chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(localstatedir)/swtpm-localca \|\| true; \
	14	fi
	15
	16	EXTRA_DIST= \
	17	diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
	18	index 1f0b48d..63f1fed 100644
	19	--- a/samples/swtpm-localca.conf.in
	20	+++ b/samples/swtpm-localca.conf.in
	21	@@ -1,4 +1,4 @@
	22	-statedir = @LOCALSTATEDIR@/lib/swtpm-localca
	23	-signingkey = @LOCALSTATEDIR@/lib/swtpm-localca/signkey.pem
	24	-issuercert = @LOCALSTATEDIR@/lib/swtpm-localca/issuercert.pem
	25	-certserial = @LOCALSTATEDIR@/lib/swtpm-localca/certserial
	26	+statedir = @LOCALSTATEDIR@/swtpm-localca
	27	+signingkey = @LOCALSTATEDIR@/swtpm-localca/signkey.pem
	28	+issuercert = @LOCALSTATEDIR@/swtpm-localca/issuercert.pem
	29	+certserial = @LOCALSTATEDIR@/swtpm-localca/certserial

Line 0 Link Here

(-)a/app-crypt/swtpm/swtpm-0.1.0.ebuild (+54 lines)
	1	# Copyright 1999-2019 Gentoo Authors
	2	# Distributed under the terms of the GNU General Public License v2
	3
	4	EAPI=7
	5
	6	PYTHON_COMPAT=( python3_{4,5,6} )
	7
	8	inherit autotools python-any-r1
	9
	10	DESCRIPTION="Libtpms-based TPM emulator"
	11	HOMEPAGE="https://github.com/stefanberger/swtpm"
	12	SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz"
	13	LICENSE="BSD"
	14	SLOT="0"
	15	KEYWORDS="~amd64"
	16	IUSE="gnutls fuse test"
	17
	18	COMMON_DEPEND="dev-libs/libtpms
	19	dev-libs/openssl:0
	20	fuse? ( sys-fs/fuse:0
	21	>=dev-libs/glib-2.0.0 )
	22	gnutls? ( >=net-libs/gnutls-3.1.0[tools]
	23	dev-libs/libtasn1 )"
	24
	25	DEPEND="${COMMON_DEPEND}
	26	test? ( net-misc/socat
	27	${PYTHON_DEPS} )"
	28
	29	RDEPEND="${COMMON_DEPEND}
	30	dev-tcltk/expect
	31	app-crypt/trousers
	32	app-crypt/tpm-tools
	33	sys-apps/gawk"
	34
	35	src_prepare() {
	36	use !test && eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
	37	eapply "${FILESDIR}/${PN}-fix-localca-path.patch"
	38	eapply_user
	39	eautoreconf
	40	}
	41
	42	src_configure() {
	43	econf \
	44	--with-openssl \
	45	--without-selinux \
	46	$(use_with gnutls) \
	47	$(use_with fuse cuse)
	48	}
	49
	50	src_install() {
	51	emake DESTDIR="${D}" install
	52	fowners tss: /var/lib/swtpm-localca
	53	keepdir /var/lib/swtpm-localca
	54	}

Line 0 Link Here

(-)a/app-crypt/swtpm/swtpm-9999.ebuild (-1 / +54 lines)
0	-	1	# Copyright 1999-2019 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=7
		5
		6	PYTHON_COMPAT=( python3_{4,5,6} )
		7
		8	inherit git-r3 autotools python-any-r1
		9
		10	DESCRIPTION="Libtpms-based TPM emulator"
		11	HOMEPAGE="https://github.com/stefanberger/swtpm"
		12	EGIT_REPO_URI="https://github.com/stefanberger/swtpm.git"
		13	LICENSE="BSD"
		14	SLOT="0"
		15	KEYWORDS=""
		16	IUSE="gnutls fuse test"
		17
		18	COMMON_DEPEND="dev-libs/libtpms
		19	dev-libs/openssl:0
		20	fuse? ( sys-fs/fuse:0
		21	>=dev-libs/glib-2.0.0 )
		22	gnutls? ( >=net-libs/gnutls-3.1.0[tools]
		23	dev-libs/libtasn1 )"
		24
		25	DEPEND="${COMMON_DEPEND}
		26	test? ( net-misc/socat
		27	${PYTHON_DEPS} )"
		28
		29	RDEPEND="${COMMON_DEPEND}
		30	dev-tcltk/expect
		31	app-crypt/trousers
		32	app-crypt/tpm-tools
		33	sys-apps/gawk"
		34
		35	src_prepare() {
		36	use !test && eapply "${FILESDIR}/${PN}-disable-test-dependencies.patch"
		37	eapply "${FILESDIR}/${P}-fix-localca-path.patch"
		38	eapply_user
		39	eautoreconf
		40	}
		41
		42	src_configure() {
		43	econf \
		44	--with-openssl \
		45	--without-selinux \
		46	$(use_with gnutls) \
		47	$(use_with fuse cuse)
		48	}
		49
		50	src_install() {
		51	emake DESTDIR="${D}" install
		52	fowners tss: /var/lib/swtpm-localca
		53	keepdir /var/lib/swtpm-localca
		54	}