Re: [PR PATCH] [Updated] New package: swtpm

[Johnnynator <Johnnynator@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1622 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages swtpm
https://github.com/void-linux/void-packages/pull/33329

New package: swtpm
- New package: libtpms-0.9.0
- New package: swtpm-0.6.1

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33329.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-swtpm-33329.patch --]
[-- Type: text/x-diff, Size: 5850 bytes --]

From 24cc982139c812a6db0423900726cf185405f154 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 4 Oct 2021 22:19:08 +0200
Subject: [PATCH 1/2] New package: libtpms-0.9.0

---
 common/shlibs            |  1 +
 srcpkgs/libtpms-devel    |  1 +
 srcpkgs/libtpms/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/libtpms-devel
 create mode 100644 srcpkgs/libtpms/template

diff --git a/common/shlibs b/common/shlibs
index 7e5289f58f66..f7279cc13b02 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3443,6 +3443,7 @@ libcss_parser_pp.so.0 htmlcxx-0.86_1
 libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
 libre.so.1 re-2.0.1_1
+libtpms.so.0 libtpms-0.9.0_1
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/libtpms-devel b/srcpkgs/libtpms-devel
new file mode 120000
index 000000000000..a7b2c51dadbc
--- /dev/null
+++ b/srcpkgs/libtpms-devel
@@ -0,0 +1 @@
+libtpms
\ No newline at end of file
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
new file mode 100644
index 000000000000..113d08f78d10
--- /dev/null
+++ b/srcpkgs/libtpms/template
@@ -0,0 +1,34 @@
+# Template file for 'libtpms'
+pkgname=libtpms
+version=0.9.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="libtool automake pkg-config"
+makedepends="openssl-devel"
+short_desc="Software emulation of a Trusted Platform Module (TPM 1.2 and TPM 2.0)"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause, custom:IBM"
+homepage="https://github.com/stefanberger/libtpms"
+distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz"
+checksum=bcd94c8880c471358c58db89be30420384ca0ef50a0048da8d04352841d1e2fb
+
+pre_configure() {
+	autoreconf -f -i
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+
+libtpms-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} openssl-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From 2803a3179e26e5613cbf11bc4c84c325e2d79cc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 4 Oct 2021 22:37:55 +0200
Subject: [PATCH 2/2] New package: swtpm-0.6.1

---
 common/shlibs             |  1 +
 srcpkgs/libswtpm          |  1 +
 srcpkgs/libswtpm-devel    |  1 +
 srcpkgs/swtpm/template    | 55 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/trousers/template |  1 +
 5 files changed, 59 insertions(+)
 create mode 120000 srcpkgs/libswtpm
 create mode 120000 srcpkgs/libswtpm-devel
 create mode 100644 srcpkgs/swtpm/template

diff --git a/common/shlibs b/common/shlibs
index f7279cc13b02..c97aa26d3120 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3444,6 +3444,7 @@ libcss_parser.so.0 htmlcxx-0.86_1
 libaom.so.2 libaom-2.0.0_1
 libre.so.1 re-2.0.1_1
 libtpms.so.0 libtpms-0.9.0_1
+libswtpm_libtpms.so.0 libswtpm-0.6.1_1
 libspandsp.so.2 spandsp-0.0.6_1
 libspa-alsa.so libspa-alsa-0.3.6_1
 libspa-audioconvert.so libspa-audioconvert-0.3.6_1
diff --git a/srcpkgs/libswtpm b/srcpkgs/libswtpm
new file mode 120000
index 000000000000..0e4930bcfe73
--- /dev/null
+++ b/srcpkgs/libswtpm
@@ -0,0 +1 @@
+swtpm
\ No newline at end of file
diff --git a/srcpkgs/libswtpm-devel b/srcpkgs/libswtpm-devel
new file mode 120000
index 000000000000..0e4930bcfe73
--- /dev/null
+++ b/srcpkgs/libswtpm-devel
@@ -0,0 +1 @@
+swtpm
\ No newline at end of file
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
new file mode 100644
index 000000000000..90d914ccdbff
--- /dev/null
+++ b/srcpkgs/swtpm/template
@@ -0,0 +1,55 @@
+# Template file for 'swtpm'
+pkgname=swtpm
+version=0.6.1
+revision=1
+build_style=gnu-configure
+configure_args="--with-gnutls ac_cv_path_TCSD="
+make_check_args="VERBOSE=1"
+hostmakedepends="libtool automake pkg-config iproute2 expect
+ socat python3 gnutls-tools"
+makedepends="gnutls-devel libtasn1-devel libtpms-devel json-glib-devel
+ libseccomp-devel fuse-devel"
+depends="gnutls-tools"
+short_desc="TPM emulator with socket, character device, and Linux CUSE interface"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="https://github.com/stefanberger/swtpm"
+distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
+checksum=114905d6a51af89baac9ac279bf6534761e01adcf9c9bb298f1c09c7d4b2599d
+# check expects that root directory is setup fully for swtpm with e.g. tss user created
+make_check=no
+ignore_elf_files="/usr/share/swtpm/swtpm-localca"
+# keep tss acount in sync with trousers
+system_accounts="tss"
+tss_homedir=/var/lib/tpm
+make_dirs="/var/lib/tpm 0700 tss tss
+ /var/lib/swtpm-localca 0750 tss root"
+
+conf_files="/etc/swtpm-localca.conf
+ /etc/swtpm-localca.options
+ /etc/swtpm_setup.conf"
+
+pre_configure() {
+	autoreconf -f -i
+}
+
+post_install() {
+	vlicense LICENSE
+}
+
+libswtpm_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove "usr/lib/swtpm/*.so.*"
+	}
+}
+
+libswtpm-devel_package() {
+	depends="lib${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/swtpm/*.a"
+		vmove "usr/lib/swtpm/*.so"
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 8c6355f86609..817beba476a9 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -12,6 +12,7 @@ license="BSD-3-Clause"
 homepage="http://trousers.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47
+# Keep tss account in sync with swtpm package
 system_accounts=tss
 tss_homedir=/var/lib/tpm
 make_dirs="/var/lib/tpm 0700 tss tss"