diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-security/recipes-security/keynote/keynote-2.3 | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-security/keynote/keynote-2.3')
3 files changed, 89 insertions, 0 deletions
diff --git a/meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch b/meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch new file mode 100644 index 000000000..af3ef421d --- /dev/null +++ b/meta-security/recipes-security/keynote/keynote-2.3/configure-remove-hardcode-path.patch @@ -0,0 +1,37 @@ +Remove the hardcoded lib and include dirs + +Upstream-Status: Inappropriate [cross compile specific] + +written by: Amy Fong <amy.fong@windriver.com> +Signed-off-by: Jackie Huang <jackie.huang@windriver.com> + +--- keynote-2.3/configure.in.orig 2010-05-24 04:44:16.000000000 -0700 ++++ keynote-2.3/configure.in 2010-05-24 04:44:55.000000000 -0700 +@@ -21,27 +21,16 @@ + AC_PATH_PROG(ECHO, echo, /bin/echo) + AC_PATH_PROG(SED, sed, /usr/bin/sed) + +-dnl Checks for libraries. +-LIBS="-L/usr/lib -L/usr/local/lib -L/usr/ssl/lib -L/usr/openssl/lib\ +- -L/usr/local/ssl/lib -L/usr/local/openssl/lib -L/usr/pkg/lib -L/pkg/lib" +- + AC_CHECK_LIB(m, floor, LIBS="$LIBS -lm") + AC_CHECK_LIB(rsaref, RSAPrivateDecrypt, LIBS="$LIBS -lrsaref") + AC_CHECK_LIB(crypto, i2a_ASN1_STRING, LIBS="$LIBS -lcrypto") + AC_CHECK_LIB(RSAglue, RSA_ref_private_encrypt, LIBS="$LIBS -lRSAglue") + +-dnl Checks for header files. +-CPPFLAGS="-I/usr/include -I/usr/local/include -I/usr/ssl/include\ +- -I/usr/local/ssl/include -I/usr/openssl/include -I/usr/pkg/include\ +- -I/usr/local/openssl/include -I/pkg/include" +- + AC_HEADER_STDC + AC_HEADER_TIME + AC_CHECK_HEADERS(fcntl.h limits.h unistd.h regex.h sys/time.h io.h) + AC_CHECK_HEADERS(ssl/crypto.h openssl/crypto.h crypto.h memory.h) + +-dnl Checks for other files +- + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST + AC_CHECK_TYPE(u_int, unsigned int) diff --git a/meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch b/meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch new file mode 100644 index 000000000..80d87cf28 --- /dev/null +++ b/meta-security/recipes-security/keynote/keynote-2.3/makefile-add-ldflags.patch @@ -0,0 +1,36 @@ +Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> + +diff --git a/Makefile.in b/Makefile.in +index b216648..42b4827 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -35,6 +35,7 @@ MKDIR = @MKDIR@ + SED = @SED@ + ECHO = @ECHO@ + TR = @TR@ ++LDFLAGS = @LDFLAGS@ + + TARFLAGS = -cvzf ${DISTFILE} + YACCFLAGS2 = -d -p kv -b z +@@ -83,7 +84,7 @@ $(TARGET): $(OBJS) + $(RANLIB) $(TARGET) + + $(TARGET2): $(TARGET) $(OBJS2) +- $(CC) $(CFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET2) $(OBJS2) $(LIBS) + + k.tab.c: keynote.y header.h keynote.h assertion.h config.h + $(YACC) $(YACCFLAGS) keynote.y +@@ -131,7 +132,7 @@ $(SSLCERT) $(SSLKEY): + -keyout $(SSLKEY) + + test-sample: all $(OBJS3) +- $(CC) $(CFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET3) $(OBJS3) $(LIBS) + + test-sig: all $(SSLCERT) $(SSLKEY) + $(SED) -e 's/--.*//' < $(SSLCERT) > $(SSLCERT).1 diff --git a/meta-security/recipes-security/keynote/keynote-2.3/run-ptest b/meta-security/recipes-security/keynote/keynote-2.3/run-ptest new file mode 100644 index 000000000..4dc35c9d1 --- /dev/null +++ b/meta-security/recipes-security/keynote/keynote-2.3/run-ptest @@ -0,0 +1,16 @@ +#!/bin/sh + +cd @PTEST_PATH@ +keynote verify -e testsuite/test-env \ + -r false,maybe,probably,true \ + -k testsuite/auth1 -k testsuite/auth2 \ + -k testsuite/auth3 -k testsuite/auth4 \ + -l testsuite/test-assertion1 \ + -l testsuite/test-assertion2 \ + -l testsuite/test-assertion3 \ + -l testsuite/test-assertion4 \ + -l testsuite/test-assertion5 \ + -l testsuite/test-assertion6 \ + -l testsuite/test-assertion7 \ + && echo "PASS: keynote-ptest" \ + || echo "FAIL: keynote-ptest" |