diff options
| author |   Salah Coronya <salah.coronya@gmail.com> | 2020-10-07 22:41:22 -0500 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-10-12 12:05:56 +0300 |
| commit | 6831cad0d840161769d2621073ffa5ec335fdb6c (patch) | |
| tree | e0e7ab53b6b51c4f7af94d560765ffa9fbe88838 /app-crypt/swtpm/files | |
| parent | media-fonts/fontawesome: drop old versions (diff) | |
| download | gentoo-6831cad0d840161769d2621073ffa5ec335fdb6c.tar.gz gentoo-6831cad0d840161769d2621073ffa5ec335fdb6c.tar.bz2 gentoo-6831cad0d840161769d2621073ffa5ec335fdb6c.zip | |
app-crypt/swtpm: Bump to 0.5.0
Closes: https://bugs.gentoo.org/744442
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Salah Coronya <salah.coronya@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'app-crypt/swtpm/files')
3 files changed, 70 insertions, 0 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-0.5.0-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch new file mode 100644 index 000000000000..27d29fc55aed --- /dev/null +++ b/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch @@ -0,0 +1,31 @@ +diff --git a/samples/Makefile.am b/samples/Makefile.am +index 7d69bf8..9fb8338 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -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 -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 + + # 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 ++++ b/samples/swtpm-localca.conf.in +@@ -1,4 +1,4 @@ +-statedir = @LOCALSTATEDIR@/lib/swtpm-localca +-signingkey = @LOCALSTATEDIR@/lib/swtpm-localca/signkey.pem +-issuercert = @LOCALSTATEDIR@/lib/swtpm-localca/issuercert.pem +-certserial = @LOCALSTATEDIR@/lib/swtpm-localca/certserial ++statedir = @LOCALSTATEDIR@/swtpm-localca ++signingkey = @LOCALSTATEDIR@/swtpm-localca/signkey.pem ++issuercert = @LOCALSTATEDIR@/swtpm-localca/issuercert.pem ++certserial = @LOCALSTATEDIR@/swtpm-localca/certserial |