[packages/tpm2-tss] - updated to 3.2.0 (now requires openssl >= 1.1.0 and supports up to 3.0.0) - removed outdated insta

qboosh qboosh at pld-linux.org
Mon Feb 21 17:49:22 CET 2022


commit b12a6b160bf611af26f58bdd8164d5a731b4ab79
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 21 17:51:10 2022 +0100

    - updated to 3.2.0 (now requires openssl >= 1.1.0 and supports up to 3.0.0)
    - removed outdated install patch

 tpm2-tss-install.patch | 34 ----------------------------------
 tpm2-tss.spec          | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/tpm2-tss.spec b/tpm2-tss.spec
index b35a8a1..8655ad3 100644
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -5,25 +5,25 @@
 Summary:	OSS implementation of the TCG TPM2 Software Stack (TSS2)
 Summary(pl.UTF-8):	Mająca otwarte źródła implementacja TCG TPM2 Software Stack (TSS2)
 Name:		tpm2-tss
-Version:	3.1.0
-Release:	2
+Version:	3.2.0
+Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: https://github.com/tpm2-software/tpm2-tss/releases
 Source0:	https://github.com/tpm2-software/tpm2-tss/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	4d04cf52fff4ee061bb3f7b4f4ea03b7
-Patch0:		%{name}-install.patch
+# Source0-md5:	0d60d0df3fd0daae66881a3022281323
 URL:		https://github.com/tpm2-software/tpm2-tss
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	doxygen
 BuildRequires:	json-c-devel
-BuildRequires:	libltdl-devel
+BuildRequires:	libltdl-devel >= 2:2
 BuildRequires:	libtool >= 2:2
 %{?with_mbedtls:BuildRequires:	mbedtls-devel}
-%{!?with_mbedtls:BuildRequires:	openssl-devel >= 0.9.8}
+%{!?with_mbedtls:BuildRequires:	openssl-devel >= 1.1.0}
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,7 +46,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	curl-devel
 Requires:	json-c-devel
 %{?with_mbedtls:Requires:	mbedtls-devel >= 1.6.0}
-%{!?with_mbedtls:Requires:	openssl-devel >= 0.9.8}
+%{!?with_mbedtls:Requires:	openssl-devel >= 1.1.0}
 
 %description devel
 Header files for implementation of the Trusted Computing Group's (TCG)
@@ -89,7 +89,9 @@ Biblioteka statyczna tpm2-tss.
 
 %prep
 %setup -q
-%patch0 -p1
+
+# set VERSION properly when there is no .git directory
+%{__sed} -i -e 's/m4_esyscmd_s(\[git describe --tags --always --dirty\])/%{version}/' configure.ac
 
 %build
 %{__libtoolize}
diff --git a/tpm2-tss-install.patch b/tpm2-tss-install.patch
deleted file mode 100644
index 5349b5e..0000000
--- a/tpm2-tss-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- tpm2-tss-3.1.0/configure.ac.orig	2021-05-17 20:42:46.000000000 +0200
-+++ tpm2-tss-3.1.0/configure.ac	2021-06-14 21:52:12.075225467 +0200
-@@ -470,15 +470,6 @@
- AM_CONDITIONAL(SYSD_SYSUSERS, test "x$systemd_sysusers" = "xyes")
- AC_CHECK_PROG(systemd_tmpfiles, systemd-tmpfiles, yes)
- AM_CONDITIONAL(SYSD_TMPFILES, test "x$systemd_tmpfiles" = "xyes")
--# Check all tools used by make install
--AS_IF([test "$HOSTOS" = "Linux"],
--      [ERROR_IF_NO_PROG([groupadd])
--       ERROR_IF_NO_PROG([useradd])
--       ERROR_IF_NO_PROG([id])
--       ERROR_IF_NO_PROG([chown])
--       ERROR_IF_NO_PROG([chmod])
--       ERROR_IF_NO_PROG([mkdir])
--       ERROR_IF_NO_PROG([setfacl])])
- 
- AC_SUBST([PATH])
- 
---- tpm2-tss-3.1.0/Makefile.am.orig	2021-05-10 17:40:44.000000000 +0200
-+++ tpm2-tss-3.1.0/Makefile.am	2021-06-14 22:30:33.596090392 +0200
-@@ -690,13 +690,6 @@
- 
- install-dirs:
- if HOSTOS_LINUX
--if SYSD_SYSUSERS
--	@echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
--	@systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
--else
--	@echo "call make_tss_user_and_group"
--	@$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
--endif
- if SYSD_TMPFILES
- 	@echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
- 	@systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tpm2-tss.git/commitdiff/b12a6b160bf611af26f58bdd8164d5a731b4ab79



More information about the pld-cvs-commit mailing list