* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtpms/files/, dev-libs/libtpms/
@ 2020-10-08 6:57 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-10-08 6:57 UTC (permalink / raw
To: gentoo-commits
commit: e6ddcb72a8738fc10d1cbf3812d4764bbe2db009
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu Sep 24 19:28:15 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Oct 8 06:48:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ddcb72
dev-libs/libtpms: Remove -WError
Closes: https://bugs.gentoo.org/744445
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17654
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch | 13 +++++++++++++
dev-libs/libtpms/libtpms-0.7.3.ebuild | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
new file mode 100644
index 00000000000..fe17f898f5e
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1bb45d1..147aa84 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,7 +283,7 @@ if test "x$enable_hardening" != "xno"; then
+ AC_SUBST([HARDENING_LDFLAGS])
+ fi
+
+-CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign"
++CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Wreturn-type -Wsign-compare -Wno-self-assign"
+ LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
+
+ AC_CONFIG_FILES(Makefile \
diff --git a/dev-libs/libtpms/libtpms-0.7.3.ebuild b/dev-libs/libtpms/libtpms-0.7.3.ebuild
index 1daf31882dc..ad9f41f5b8a 100644
--- a/dev-libs/libtpms/libtpms-0.7.3.ebuild
+++ b/dev-libs/libtpms/libtpms-0.7.3.ebuild
@@ -17,6 +17,10 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.7.3-Remove-WError.patch"
+ )
+
src_prepare() {
default
eautoreconf
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtpms/files/, dev-libs/libtpms/
@ 2021-03-06 15:13 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-03-06 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 305e05f1c3ab5ed8927cb0ffc773837e0e352c65
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Feb 27 02:41:03 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 15:12:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305e05f1
dev-libs/libtpms: Remove old
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19630
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/libtpms/Manifest | 1 -
.../files/libtpms-0.7.3-Remove-WError.patch | 13 --------
dev-libs/libtpms/libtpms-0.7.4.ebuild | 39 ----------------------
3 files changed, 53 deletions(-)
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index ccefcd58721..93f2642fb36 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,2 +1 @@
-DIST libtpms-0.7.4.tar.gz 1212986 BLAKE2B ff34a9c35167a251eb8ba222255f6be316503d67dde7fba46b6cbc32a1f4eb5ff5a2bb5f0c21963b8d879481f6f4b09646e8e0c5fcddb12cb73309c47505070f SHA512 5a396a7e8273bed1159b0c48d2bf9f02550fed06656240e336778587b7fbe53859dab8f2ba479683e02fedfde4260a9083641be161aec0cb38a605399300997a
DIST libtpms-0.8.2.tar.gz 1253915 BLAKE2B 48281512f2611376f0f3a67a2646fdc406c2d28bfd560a07b23c122a1b4d68c2840c5cd23f41beae4a13eab419e722aed821cecd919ae6219da325724d55e3b3 SHA512 635f1b30265f1752602caefa1fa87f0032e4d38f1b7113137b7e25a85da10e34f89f9d928b960660e9451306807f111ed96c2a11cbb2de4fb4beb7e638f83727
diff --git a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch b/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
deleted file mode 100644
index fe17f898f5e..00000000000
--- a/dev-libs/libtpms/files/libtpms-0.7.3-Remove-WError.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1bb45d1..147aa84 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -283,7 +283,7 @@ if test "x$enable_hardening" != "xno"; then
- AC_SUBST([HARDENING_LDFLAGS])
- fi
-
--CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign"
-+CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Wreturn-type -Wsign-compare -Wno-self-assign"
- LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
-
- AC_CONFIG_FILES(Makefile \
diff --git a/dev-libs/libtpms/libtpms-0.7.4.ebuild b/dev-libs/libtpms/libtpms-0.7.4.ebuild
deleted file mode 100644
index e11a466ade7..00000000000
--- a/dev-libs/libtpms/libtpms-0.7.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libressl"
-
-DEPEND=" !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.7.3-Remove-WError.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- --with-openssl \
- --with-tpm2
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtpms/files/, dev-libs/libtpms/
@ 2021-09-24 7:22 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-09-24 7:22 UTC (permalink / raw
To: gentoo-commits
commit: cf3c5e5d55eeb993e05f797309c074a8446444d7
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Sep 21 21:40:34 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 07:21:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3c5e5d
dev-libs/libtpms: Remove old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22362
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/libtpms/Manifest | 1 -
.../files/libtpms-0.8.0-Remove-WError.patch | 13 ------
dev-libs/libtpms/libtpms-0.8.6.ebuild | 49 ----------------------
3 files changed, 63 deletions(-)
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index d341cd25e0a..356d8760a53 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,2 +1 @@
-DIST libtpms-0.8.6.tar.gz 1255964 BLAKE2B 44d9b1f78944ede5842b3cbef09900899f53ba3525e63f09de8263b9c1878a889db80eaf3ba35334a2233334bcb4ebd03d2bb841e4184059f9a155ad4a2aa244 SHA512 d57d52d140d582a6a7d2146aa9a10445c5c50807da53b26f6efbb8632ac83afa3c67e1a47ffa6a898a45cbac3aff199fe61947d69bc5af727e9623564bac45d8
DIST libtpms-0.8.7.tar.gz 1256807 BLAKE2B d3630ece39a78dcc99d15ad603eec5c3d858d1d0c928ae2d3ae5ad5e4d419e186fa23b25ad15824806838401aac33e7224d7cc7ce6fb79647500d4b3a3871223 SHA512 061ec66bbeee9838f12c6a9724ba953cd604981148d6f3a8ebe444e89e59b228b763d8f98c55d67b9477277ccbf9987f2e5632d1b518e78d182f5d7066020ed4
diff --git a/dev-libs/libtpms/files/libtpms-0.8.0-Remove-WError.patch b/dev-libs/libtpms/files/libtpms-0.8.0-Remove-WError.patch
deleted file mode 100644
index 05988734f59..00000000000
--- a/dev-libs/libtpms/files/libtpms-0.8.0-Remove-WError.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 40d2c7f..809f8e0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -304,7 +304,7 @@ if test "x$enable_hardening" != "xno"; then
- AC_SUBST([HARDENING_LDFLAGS])
- fi
-
--CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare -Wno-self-assign"
-+CFLAGS="$CFLAGS $COVERAGE_CFLAGS -Wall -Wreturn-type -Wsign-compare -Wno-self-assign"
- CFLAGS="$CFLAGS -Wmissing-prototypes"
- LDFLAGS="$LDFLAGS $COVERAGE_LDFLAGS"
-
diff --git a/dev-libs/libtpms/libtpms-0.8.6.ebuild b/dev-libs/libtpms/libtpms-0.8.6.ebuild
deleted file mode 100644
index fe5361b4519..00000000000
--- a/dev-libs/libtpms/libtpms-0.8.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Library providing software emultion of a TPM"
-HOMEPAGE="https://github.com/stefanberger/libtpms"
-SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.8.0-Remove-WError.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- --with-openssl \
- --with-tpm2
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.8.0; then
- elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
- elog "keys due to a flawed key creation algorithm. Because fixing this would render"
- elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
- elog "TPM state file must be deleted and a new TPM state file created. Data still"
- elog "sealed using the old state file will be permanently inaccessible. For the"
- elog "details see https://github.com/stefanberger/libtpms/issues/183"
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtpms/files/, dev-libs/libtpms/
@ 2025-02-25 4:15 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-02-25 4:15 UTC (permalink / raw
To: gentoo-commits
commit: 7dffb121b44164c788806b71c16fec40f39754d1
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Tue Feb 25 00:36:04 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 04:14:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dffb121
dev-libs/libtpms: Fix nvram_offsets test on 32-bit platforms
Closes: https://bugs.gentoo.org/948139
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40742
Signed-off-by: Sam James <sam <AT> gentoo.org>
...2-Add-padding-to-OBJECT-for-32bit-targets.patch | 32 +++++++++++++
dev-libs/libtpms/libtpms-0.10.0-r1.ebuild | 52 ++++++++++++++++++++++
2 files changed, 84 insertions(+)
diff --git a/dev-libs/libtpms/files/libtpms-0.10.0-tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch b/dev-libs/libtpms/files/libtpms-0.10.0-tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch
new file mode 100644
index 000000000000..d9a3c17b57fb
--- /dev/null
+++ b/dev-libs/libtpms/files/libtpms-0.10.0-tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch
@@ -0,0 +1,32 @@
+Bug: https://bugs.gentoo.org/948139
+
+From 095a085b6f447551110e09b2013c6a21c2a29f2d Mon Sep 17 00:00:00 2001
+From: Stefan Berger <stefanb@linux.ibm.com>
+Date: Fri, 15 Nov 2024 08:07:23 -0500
+Subject: [PATCH] tpm2: Add padding to OBJECT for 32bit targets
+
+The nvram_offsets test fails on 32bit targets due to an unexpected size
+of an OBJECT. This was due to missing padding.
+
+Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
+---
+ src/tpm2/Global.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/tpm2/Global.h b/src/tpm2/Global.h
+index 910b940..c4d7176 100644
+--- a/src/tpm2/Global.h
++++ b/src/tpm2/Global.h
+@@ -265,6 +265,9 @@ typedef struct OBJECT
+ // this field carries additional metadata
+ // needed to derive the proof value for
+ // the object.
++#if __LONG_WIDTH__ == 32
++ UINT8 _pad1[4]; /* 32 bit targets need padding */
++#endif
+
+ // libtpms added: SEED_COMPAT_LEVEL to use for deriving child keys
+ SEED_COMPAT_LEVEL seedCompatLevel;
+--
+2.45.3
+
diff --git a/dev-libs/libtpms/libtpms-0.10.0-r1.ebuild b/dev-libs/libtpms/libtpms-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..6bb387ee03b5
--- /dev/null
+++ b/dev-libs/libtpms/libtpms-0.10.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools eapi9-ver
+
+DESCRIPTION="Library providing software emulation of a TPM"
+HOMEPAGE="https://github.com/stefanberger/libtpms"
+SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="dev-libs/openssl:="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.10.0-Remove-WError.patch"
+ "${FILESDIR}/${PN}-0.10.0-tpm2-Add-padding-to-OBJECT-for-32bit-targets.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # --disable-hardening because it just sets what our toolchain
+ # already does. If the user wants to disable that in their *FLAGS,
+ # or via USE on toolchain packages, honour that.
+ econf \
+ --with-openssl \
+ --disable-hardening
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if ver_replacing -lt 0.8.0; then
+ elog "Versions of libtpms prior to 0.8.0 generate weaker than expected TPM 2.0 RSA"
+ elog "keys due to a flawed key creation algorithm. Because fixing this would render"
+ elog "existing sealed data inaccessible, to use the corrected algorithm, the old"
+ elog "TPM state file must be deleted and a new TPM state file created. Data still"
+ elog "sealed using the old state file will be permanently inaccessible. For the"
+ elog "details see https://github.com/stefanberger/libtpms/issues/183"
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-25 4:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-24 7:22 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libtpms/files/, dev-libs/libtpms/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2025-02-25 4:15 Sam James
2021-03-06 15:13 Joonas Niilola
2020-10-08 6:57 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox