gentoo resync : 25.11.2020

6 files changed, 47 insertions, 147 deletions

diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-build-sys-Remove-WError.patch b/app-crypt/swtpm/files/swtpm-0.5.0-build-sys-Remove-WError.patch
new file mode 100644
index 000000000000..4afd5408d9c6
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.5.0-build-sys-Remove-WError.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index d035653..1db5c5c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -461,7 +461,7 @@ AC_SUBST([TSS_USER])
+ AC_SUBST([TSS_GROUP])
+ 
+ CFLAGS="$CFLAGS -Wreturn-type -Wsign-compare -Wswitch-enum"
+-CFLAGS="$CFLAGS -Wmissing-prototypes -Wall -Werror"
++CFLAGS="$CFLAGS -Wmissing-prototypes -Wall"
+ CFLAGS="$CFLAGS -Wformat -Wformat-security"
+ CFLAGS="$CFLAGS $GNUTLS_CFLAGS $COVERAGE_CFLAGS"
+ 
diff --git a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
new file mode 100644
index 000000000000..3880385256e3
--- /dev/null
+++ b/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index d035653..0728a2e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -325,21 +325,11 @@ fi
+ AM_CONDITIONAL([WITH_GNUTLS], [test "x$with_gnutls" = "xyes"])
+ AC_SUBST([GNUTLS_LIBS])
+ 
+-AC_PATH_PROG([EXPECT], expect)
+-if test "x$EXPECT" = "x"; then
+-	AC_MSG_ERROR([expect is required: expect package])
+-fi
+-
+ AC_PATH_PROG([GAWK], gawk)
+ 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([BASE64], base64)
+ if test "x$BASE64" = "x"; then
+ 	AC_MSG_ERROR([base64 is required: base64 package])
diff --git a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch
index c83758da5636..27d29fc55aed 100644
--- a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch
+++ b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch
@@ -1,19 +1,21 @@
 diff --git a/samples/Makefile.am b/samples/Makefile.am
-index 4558d66..6fc6d77 100644
+index 7d69bf8..9fb8338 100644
 --- a/samples/Makefile.am
 +++ b/samples/Makefile.am
-@@ -16,9 +16,9 @@ samplessysconf_DATA = \
- 	swtpm-localca.options
+@@ -56,10 +56,10 @@ endif
+ 
  
  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; \
+-		chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
+-		chmod 0750 $(DESTDIR)$(localstatedir)/lib/swtpm-localca || true; \
++		chown -R @TSS_USER@:root $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
++		chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \
  	fi
  
- EXTRA_DIST= \
+ # for out-of-tree builds we need to clean up
 diff --git a/samples/swtpm-localca.conf.in b/samples/swtpm-localca.conf.in
 index 1f0b48d..63f1fed 100644
 --- a/samples/swtpm-localca.conf.in
diff --git a/app-crypt/swtpm/files/swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch b/app-crypt/swtpm/files/swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch
deleted file mode 100644
index d4ad9cda0c2d..000000000000
--- a/app-crypt/swtpm/files/swtpm-build-sys-Explicitly-link-libswtpm_libtpms-with-lcry.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d9bc718871810d18c70ba9d4e9ee23071bd6db36 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Tue, 21 Jul 2020 18:39:07 -0400
-Subject: [PATCH 2/2] build-sys: Explicitly link libswtpm_libtpms with -lcrypto
- (Gentoo)
-
-This patch fixes the following linker issue reported for Gentoo in
-issue #280.
-
-ld.lld: error: /var/tmp/portage/app-crypt/swtpm-0.3.1-r1/work/swtpm-0.3.1/src/swtpm/.libs/libswtpm_libtpms.so: undefined reference to EVP_sha512
-ld.lld: error: /var/tmp/portage/app-crypt/swtpm-0.3.1-r1/work/swtpm-0.3.1/src/swtpm/.libs/libswtpm_libtpms.so: undefined reference to PKCS5_PBKDF2_HMAC
-ld.lld: error: /var/tmp/portage/app-crypt/swtpm-0.3.1-r1/work/swtpm-0.3.1/src/swtpm/.libs/libswtpm_libtpms.so: undefined reference to SHA512
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- configure.ac          | 2 ++
- src/swtpm/Makefile.am | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 56d3f09..7aaa201 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -150,6 +150,8 @@ openssl)
- 	AC_CHECK_HEADERS([openssl/aes.h],[],
- 			 AC_MSG_ERROR(Is openssl-devel/libssl-dev installed?))
- 	AC_MSG_RESULT([Building with openssl crypto library])
-+	LIBCRYPTO_LIBS=$(pkg-config --libs libcrypto)
-+	AC_SUBST([LIBCRYPTO_LIBS])
- 	;;
- esac
- 
-diff --git a/src/swtpm/Makefile.am b/src/swtpm/Makefile.am
-index dd2a63a..b5f15e3 100644
---- a/src/swtpm/Makefile.am
-+++ b/src/swtpm/Makefile.am
-@@ -69,7 +69,8 @@ libswtpm_libtpms_la_LIBADD = \
- 	$(LIBTPMS_LIBS) \
- 	$(GLIB_LIBS) \
- 	$(LIBRT_LIBS) \
--	$(LIBSECCOMP_LIBS)
-+	$(LIBSECCOMP_LIBS) \
-+	$(LIBCRYPTO_LIBS)
- 
- bin_PROGRAMS = swtpm
- if WITH_CUSE
--- 
-2.26.2
-
diff --git a/app-crypt/swtpm/files/swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch b/app-crypt/swtpm/files/swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch
deleted file mode 100644
index 582199708057..000000000000
--- a/app-crypt/swtpm/files/swtpm-build-sys-Use-AC_COMPILE_IFELSE-to-check-for-unused-.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b6d16129a525f572ef37d20ba1cd70d59ca4f079 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Tue, 21 Jul 2020 17:38:10 -0400
-Subject: [PATCH 1/2] build-sys: Use AC_COMPILE_IFELSE to check for unused
- linker flags (clang)
-
-This patch fixes a clang issue report in issue #280.
-
-clang does not use ld, so we cannot grep for support of certain linker
-flags but have to test-compile.
-
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
----
- configure.ac | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b4d4258..56d3f09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,13 +357,25 @@ if test "x$enable_hardening" != "xno"; then
- 	if test -z "$TMP1" && test -n "$TPM2"; then
- 		HARDENING_CFLAGS="$HARDENING_CFLAGS -D_FORTIFY_SOURCE=2 "
- 	fi
--	dnl Check ld for 'relro' and 'now'
--	if $LD --help 2>&1 | $GREP '\-z relro ' > /dev/null; then
--		HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,relro "
--	fi
--	if $LD --help 2>&1 | $GREP '\-z now ' > /dev/null; then
--		HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,now "
--	fi
-+	dnl Check linker for 'relro' and 'now'
-+	save_CFLAGS="$CFLAGS"
-+	CFLAGS="-Wl,-z,relro -Werror"
-+	AC_MSG_CHECKING([whether linker supports -Wl,-z,relro])
-+	AC_COMPILE_IFELSE(
-+		[AC_LANG_SOURCE([[int main() { return 0; }]])],
-+		[HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,relro"
-+		 AC_MSG_RESULT(yes)],
-+		[AC_MSG_RESULT(no)]
-+	)
-+	CFLAGS="-Wl,-z,now -Werror"
-+	AC_MSG_CHECKING([whether linker supports -Wl,-z,now])
-+	AC_COMPILE_IFELSE(
-+		[AC_LANG_SOURCE([[int main() { return 0; }]])],
-+		[HARDENING_CFLAGS="$HARDENING_CFLAGS -Wl,-z,now"
-+		 AC_MSG_RESULT(yes)],
-+		[AC_MSG_RESULT(no)]
-+	)
-+	CFLAGS="$save_CFLAGS"
- 	AC_SUBST([HARDENING_CFLAGS])
- fi
- 
--- 
-2.26.2
-
diff --git a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
deleted file mode 100644
index ff2536676637..000000000000
--- a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 47b091a..61192bf 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,9 +9,7 @@ SUBDIRS   = \
- 	include \
- 	man \
- 	samples \
--	src \
--	tests
--
-+	src
- ACLOCAL_AMFLAGS = -I m4
- 
- EXTRA_DIST = \
-diff --git a/configure.ac b/configure.ac
-index c7b4e98..8e6445b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -330,16 +330,6 @@ 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
--
- AC_ARG_ENABLE([hardening],
-   AS_HELP_STRING([--disable-hardening], [Disable hardening flags]))
-