diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-02 19:14:55 +0100 |
| commit | b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch) | |
| tree | 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /app-crypt/swtpm/files | |
| parent | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff) | |
gentoo resync : 02.08.2019
Diffstat (limited to 'app-crypt/swtpm/files')
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch | 36 | ||||
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-fix-localca-path.patch | 29 |
2 files changed, 65 insertions, 0 deletions
diff --git a/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch new file mode 100644 index 000000000000..ff2536676637 --- /dev/null +++ b/app-crypt/swtpm/files/swtpm-disable-test-dependencies.patch @@ -0,0 +1,36 @@ +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])) + diff --git a/app-crypt/swtpm/files/swtpm-fix-localca-path.patch b/app-crypt/swtpm/files/swtpm-fix-localca-path.patch new file mode 100644 index 000000000000..c83758da5636 --- /dev/null +++ b/app-crypt/swtpm/files/swtpm-fix-localca-path.patch @@ -0,0 +1,29 @@ +diff --git a/samples/Makefile.am b/samples/Makefile.am +index 4558d66..6fc6d77 100644 +--- a/samples/Makefile.am ++++ b/samples/Makefile.am +@@ -16,9 +16,9 @@ samplessysconf_DATA = \ + swtpm-localca.options + + 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; \ + fi + + EXTRA_DIST= \ +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 |