From: jirib <jirib@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [draft] New package: swtpm-0.5.2
Date: Sat, 13 Mar 2021 01:02:01 +0100 [thread overview]
Message-ID: <20210313000201.y0NOaMOljD0kiUK0wazTI_ppKrvSx7YOq7nGqqTJme8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29338@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1610 bytes --]
There is an updated pull request by jirib against master on the void-packages repository
https://github.com/jirib/void-packages swtpm
https://github.com/void-linux/void-packages/pull/29338
[draft] New package: swtpm-0.5.2
Fixes #28955.
<!-- 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/29338.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-swtpm-29338.patch --]
[-- Type: text/x-diff, Size: 6472 bytes --]
From 19fc582cb2dbe20b1773a7ce40f35f1de91237df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20B=C4=9Blka?= <jirib79@gmail.com>
Date: Sat, 13 Mar 2021 01:00:49 +0100
Subject: [PATCH 1/3] New package: libtpms-0.7.7
---
srcpkgs/libtpms-devel | 1 +
srcpkgs/libtpms/libtpms-devel | 1 +
srcpkgs/libtpms/template | 37 +++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/libtpms-devel
create mode 120000 srcpkgs/libtpms/libtpms-devel
create mode 100644 srcpkgs/libtpms/template
diff --git a/srcpkgs/libtpms-devel b/srcpkgs/libtpms-devel
new file mode 120000
index 00000000000..a7b2c51dadb
--- /dev/null
+++ b/srcpkgs/libtpms-devel
@@ -0,0 +1 @@
+libtpms
\ No newline at end of file
diff --git a/srcpkgs/libtpms/libtpms-devel b/srcpkgs/libtpms/libtpms-devel
new file mode 120000
index 00000000000..60f3aa620dd
--- /dev/null
+++ b/srcpkgs/libtpms/libtpms-devel
@@ -0,0 +1 @@
+libtpms-devel
\ No newline at end of file
diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
new file mode 100644
index 00000000000..576b08151a5
--- /dev/null
+++ b/srcpkgs/libtpms/template
@@ -0,0 +1,37 @@
+# Template file for 'libtpms'
+pkgname=libtpms
+version=0.7.7
+revision=1
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-openssl --with-tpm2"
+hostmakedepends="automake libtool pkg-config"
+makedepends="openssl-devel"
+short_desc="TPM emulation library"
+maintainer="Jiri Belka <jirib79@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/stefanberger/libtpms"
+distfiles="https://github.com/stefanberger/libtpms/archive/v${version}.tar.gz"
+checksum=9f23b97594bb9c6d3c50e33c9be8435f03d91a591c2288b03056321e06c95db3
+
+pre_configure() {
+ autoreconf -fi
+}
+
+post_install() {
+ vlicense LICENSE
+}
+libtpms-devel_package() {
+ depends="libtpms>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "usr/share/man/man3"
+ }
+}
+
+if [ "${CROSS_BUILD}" ]; then
+ configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
+fi
From 443ebfc78afc44fd3dbc5b2bd44a126726ede5a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20B=C4=9Blka?= <jirib79@gmail.com>
Date: Sat, 13 Mar 2021 01:01:00 +0100
Subject: [PATCH 2/3] New package: swtpm-0.5.2
---
srcpkgs/libswtpm | 1 +
srcpkgs/libswtpm-devel | 1 +
srcpkgs/swtpm/patches/configure.ac.patch | 26 +++++++++++
srcpkgs/swtpm/template | 57 ++++++++++++++++++++++++
4 files changed, 85 insertions(+)
create mode 120000 srcpkgs/libswtpm
create mode 120000 srcpkgs/libswtpm-devel
create mode 100644 srcpkgs/swtpm/patches/configure.ac.patch
create mode 100644 srcpkgs/swtpm/template
diff --git a/srcpkgs/libswtpm b/srcpkgs/libswtpm
new file mode 120000
index 00000000000..0e4930bcfe7
--- /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 00000000000..0e4930bcfe7
--- /dev/null
+++ b/srcpkgs/libswtpm-devel
@@ -0,0 +1 @@
+swtpm
\ No newline at end of file
diff --git a/srcpkgs/swtpm/patches/configure.ac.patch b/srcpkgs/swtpm/patches/configure.ac.patch
new file mode 100644
index 00000000000..a29510dda4c
--- /dev/null
+++ b/srcpkgs/swtpm/patches/configure.ac.patch
@@ -0,0 +1,26 @@
+--- configure.ac.orig 2021-03-09 00:06:18.716142027 +0100
++++ configure.ac 2021-03-09 00:07:00.760879684 +0100
+@@ -440,23 +440,6 @@ AC_ARG_WITH([tss-group],
+ [TSS_GROUP="tss"]
+ )
+
+-case $have_tcsd in
+-yes)
+- AC_MSG_CHECKING([whether TSS_USER $TSS_USER is available])
+- if ! test $(id -u $TSS_USER); then
+- AC_MSG_ERROR(["$TSS_USER is not available"])
+- else
+- AC_MSG_RESULT([yes])
+- fi
+- AC_MSG_CHECKING([whether TSS_GROUP $TSS_GROUP is available])
+- if ! test $(id -g $TSS_GROUP); then
+- AC_MSG_ERROR(["$TSS_GROUP is not available"])
+- else
+- AC_MSG_RESULT([yes])
+- fi
+- ;;
+-esac
+-
+ AC_SUBST([TSS_USER])
+ AC_SUBST([TSS_GROUP])
+
diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
new file mode 100644
index 00000000000..a3c35e86f25
--- /dev/null
+++ b/srcpkgs/swtpm/template
@@ -0,0 +1,57 @@
+# Template file for 'swtpm'
+pkgname=swtpm
+version=0.5.2
+revision=1
+build_style=gnu-configure
+configure_args="--prefix=/usr --with-openssl --with-gnutls --without-cuse
+ --without-selinux"
+make_dirs="/var/lib/swtpm-localca 0750 tss root"
+hostmakedepends="automake expect gnutls-tools iproute2 libtool pkg-config
+ python3-cryptography python3-setuptools python3-Twisted socat"
+makedepends="gnutls-devel libseccomp-devel libtasn1-devel libtpms-devel
+ openssl-devel"
+depends="gnutls-tools trousers"
+checkdepends="net-tools trousers which"
+short_desc="Libtpms-based TPM emulator"
+maintainer="Jiri Belka <jirib79@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/stefanberger/swtpm"
+distfiles="https://github.com/stefanberger/swtpm/archive/v${version}.tar.gz"
+checksum=2e5ccf591e34c25bd9ae78a0aff9ff1d037dacd90b5e05b9fdc9bcece239f0af
+# requires 'tss' user present
+make_check=extended
+
+conf_files="
+ /etc/swtpm_setup.conf
+ /etc/swtpm-localca.options
+ /etc/swtpm-localca.conf"
+
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+libswtpm_package() {
+ short_desc+=" - library"
+ pkg_install() {
+ vmove "usr/lib/swtpm/*.so.*"
+ }
+}
+
+libswtpm-devel_package() {
+ depends="libswtpm-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/swtpm
+ vmove "usr/lib/swtpm/*.so"
+ vmove "usr/lib/swtpm/*.a"
+ vmove "usr/share/man/man3"
+ }
+}
+
+if [ "${CROSS_BUILD}" ]; then
+ configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
+fi
From ba912ef481462a10bfe0a6ef85ddc097a47b1ddf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20B=C4=9Blka?= <jirib79@gmail.com>
Date: Sat, 13 Mar 2021 01:01:10 +0100
Subject: [PATCH 3/3] common/shlibs: libtpms & swtpm
---
common/shlibs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0..92708d7968c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,3 +3966,5 @@ libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtpms.so.0 libtpms-0.7.7_1
+libswtpm_libtpms.so.0 swtpm-0.5.2_1
next prev parent reply other threads:[~2021-03-13 0:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 0:42 [PR PATCH] " jirib
2021-03-10 21:22 ` [PR PATCH] [Updated] " jirib
2021-03-10 22:50 ` jirib
2021-03-11 0:34 ` jirib
2021-03-11 1:11 ` jirib
2021-03-11 15:51 ` sgn
2021-03-11 16:01 ` [PR PATCH] [Updated] " jirib
2021-03-12 20:13 ` jirib
2021-03-12 21:07 ` jirib
2021-03-12 21:31 ` jirib
2021-03-12 21:52 ` jirib
2021-03-12 22:50 ` jirib
2021-03-12 22:55 ` jirib
2021-03-13 0:02 ` jirib [this message]
2021-03-13 0:15 ` jirib
2021-03-13 0:18 ` jirib
2021-03-22 19:50 ` jirib
2021-03-22 19:50 ` [PR PATCH] [Closed]: " jirib
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210313000201.y0NOaMOljD0kiUK0wazTI_ppKrvSx7YOq7nGqqTJme8@z \
--to=jirib@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).