diff options
Diffstat (limited to 'app-crypt/swtpm/files')
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch | 26 | ||||
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch (renamed from app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch) | 8 | ||||
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch | 42 | ||||
| -rw-r--r-- | app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch | 24 |
4 files changed, 70 insertions, 30 deletions
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 deleted file mode 100644 index 3880385256e3..000000000000 --- a/app-crypt/swtpm/files/swtpm-0.5.0-disable-test-dependencies.patch +++ /dev/null @@ -1,26 +0,0 @@ -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.6.0-fix-localca-path.patch index 27d29fc55aed..ae47bd5a793f 100644 --- a/app-crypt/swtpm/files/swtpm-0.5.0-fix-localca-path.patch +++ b/app-crypt/swtpm/files/swtpm-0.6.0-fix-localca-path.patch @@ -1,9 +1,9 @@ diff --git a/samples/Makefile.am b/samples/Makefile.am -index 7d69bf8..9fb8338 100644 +index dcbc9b6..68c8adb 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am -@@ -56,10 +56,10 @@ endif - +@@ -48,10 +48,10 @@ swtpm_localca_CFLAGS = \ + $(GLIB_CFLAGS) install-data-local: - $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/swtpm-localca @@ -15,7 +15,7 @@ index 7d69bf8..9fb8338 100644 + chmod 0750 $(DESTDIR)$(localstatedir)/swtpm-localca || true; \ fi - # for out-of-tree builds we need to clean up + 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 diff --git a/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch new file mode 100644 index 000000000000..b17e1c2470fc --- /dev/null +++ b/app-crypt/swtpm/files/swtpm-0.7.2-Conditionalize-test-dependencies.patch @@ -0,0 +1,42 @@ +configure.ac: Conditionalize test dependencies + +Signed-off-by: Christopher Byrne <salah.coronya@gmail.com> +--- a/configure.ac ++++ b/configure.ac +@@ -369,20 +369,25 @@ else + fi + AC_SUBST([DEFAULT_PCR_BANKS]) + +-AC_PATH_PROG([EXPECT], expect) +-if test "x$EXPECT" = "x"; then +- AC_MSG_ERROR([expect is required: expect package]) +-fi ++AC_ARG_ENABLE([test], ++ [AS_HELP_STRING([--enable-test], ++ [enable tests (default is yes)])], ++ [enable_test=$enableval], ++ [enable_test=yes]) ++ ++AS_IF([test "x$enable_test" != xno], ++ [AC_PATH_PROG([EXPECT], expect) ++ AS_IF([test "x$EXPECT" = "x"], ++ AC_MSG_ERROR([expect is required: expect package])) ++ AC_PATH_PROG([SOCAT], socat) ++ AS_IF([test "x$SOCAT" = "x"], ++ AC_MSG_ERROR([socat is required: socat package]))]) + + 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 +-- +2.34.1 + diff --git a/app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch b/app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch new file mode 100644 index 000000000000..abf0d3dbe29c --- /dev/null +++ b/app-crypt/swtpm/files/swtpm-0.8.2-slibtool.patch @@ -0,0 +1,24 @@ +diff --git a/src/swtpm_localca/Makefile.am b/src/swtpm_localca/Makefile.am +index 74532a8..41b61ec 100644 +--- a/src/swtpm_localca/Makefile.am ++++ b/src/swtpm_localca/Makefile.am +@@ -30,7 +30,6 @@ swtpm_localca_LDADD = \ + $(top_builddir)/src/utils/libswtpm_utils.la + + swtpm_localca_LDFLAGS = \ +- -L$(top_builddir)/src/utils -lswtpm_utils \ + $(MY_LDFLAGS) \ + $(GLIB_LIBS) \ + $(GMP_LIBS) \ +diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am +index c0f916b..61188c9 100644 +--- a/src/swtpm_setup/Makefile.am ++++ b/src/swtpm_setup/Makefile.am +@@ -32,7 +32,6 @@ swtpm_setup_LDADD = \ + $(top_builddir)/src/utils/libswtpm_utils.la + + swtpm_setup_LDFLAGS = \ +- -L$(top_builddir)/src/utils -lswtpm_utils \ + $(MY_LDFLAGS) \ + $(HARDENING_LDFLAGS) \ + $(GLIB_LIBS) \ |