diff options
Diffstat (limited to 'recipes-security')
5 files changed, 40 insertions, 32 deletions
diff --git a/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 0f4cef9..fcc63b3 100644 --- a/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch | |||
@@ -1,3 +1,4 @@ | |||
1 | From 47379747e34f952d31af028c672940ca7859ae3c Mon Sep 17 00:00:00 2001 | ||
1 | From: Yulong Pei <Yulong.pei@windriver.com> | 2 | From: Yulong Pei <Yulong.pei@windriver.com> |
2 | Date: Wed, 21 Jul 2010 22:33:43 +0800 | 3 | Date: Wed, 21 Jul 2010 22:33:43 +0800 |
3 | Subject: [PATCH] change finding path of nss and nspr | 4 | Subject: [PATCH] change finding path of nss and nspr |
@@ -6,13 +7,16 @@ Upstream-Status: Pending | |||
6 | 7 | ||
7 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> | 8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> |
8 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 9 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
10 | |||
9 | --- | 11 | --- |
10 | configure.ac | 12 ++++++------ | 12 | configure.ac | 12 ++++++------ |
11 | 1 files changed, 6 insertions(+), 6 deletions(-) | 13 | 1 file changed, 6 insertions(+), 6 deletions(-) |
12 | 14 | ||
15 | diff --git a/configure.ac b/configure.ac | ||
16 | index 3278200..6edec7d 100644 | ||
13 | --- a/configure.ac | 17 | --- a/configure.ac |
14 | +++ b/configure.ac | 18 | +++ b/configure.ac |
15 | @@ -618,7 +618,7 @@ | 19 | @@ -644,7 +644,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
16 | 20 | ||
17 | if test "z$with_nspr" != "z" ; then | 21 | if test "z$with_nspr" != "z" ; then |
18 | NSPR_PREFIX="$with_nspr" | 22 | NSPR_PREFIX="$with_nspr" |
@@ -21,7 +25,7 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | |||
21 | if test "z$with_gnu_ld" = "zyes" ; then | 25 | if test "z$with_gnu_ld" = "zyes" ; then |
22 | NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" | 26 | NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" |
23 | else | 27 | else |
24 | @@ -626,7 +626,7 @@ | 28 | @@ -652,7 +652,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
25 | fi | 29 | fi |
26 | NSPR_INCLUDES_FOUND="yes" | 30 | NSPR_INCLUDES_FOUND="yes" |
27 | NSPR_LIBS_FOUND="yes" | 31 | NSPR_LIBS_FOUND="yes" |
@@ -30,7 +34,7 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | |||
30 | else | 34 | else |
31 | for dir in $ac_nss_inc_dir ; do | 35 | for dir in $ac_nss_inc_dir ; do |
32 | if test -f $dir/nspr/prinit.h ; then | 36 | if test -f $dir/nspr/prinit.h ; then |
33 | @@ -664,7 +664,7 @@ | 37 | @@ -690,7 +690,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
34 | OLD_CPPFLAGS=$CPPFLAGS | 38 | OLD_CPPFLAGS=$CPPFLAGS |
35 | CPPFLAGS="$NSPR_CFLAGS" | 39 | CPPFLAGS="$NSPR_CFLAGS" |
36 | AC_EGREP_CPP(yes,[ | 40 | AC_EGREP_CPP(yes,[ |
@@ -39,7 +43,7 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | |||
39 | #if PR_VMAJOR >= 4 | 43 | #if PR_VMAJOR >= 4 |
40 | yes | 44 | yes |
41 | #endif | 45 | #endif |
42 | @@ -689,7 +689,7 @@ | 46 | @@ -715,7 +715,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
43 | NSS_NSS_H="" | 47 | NSS_NSS_H="" |
44 | 48 | ||
45 | if test "z$with_nss" != "z" ; then | 49 | if test "z$with_nss" != "z" ; then |
@@ -48,7 +52,7 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | |||
48 | if test "z$with_gnu_ld" = "zyes" ; then | 52 | if test "z$with_gnu_ld" = "zyes" ; then |
49 | NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" | 53 | NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" |
50 | else | 54 | else |
51 | @@ -697,7 +697,7 @@ | 55 | @@ -723,7 +723,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
52 | fi | 56 | fi |
53 | NSS_INCLUDES_FOUND="yes" | 57 | NSS_INCLUDES_FOUND="yes" |
54 | NSS_LIBS_FOUND="yes" | 58 | NSS_LIBS_FOUND="yes" |
@@ -57,9 +61,9 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | |||
57 | else | 61 | else |
58 | for dir in $ac_nss_inc_dir ; do | 62 | for dir in $ac_nss_inc_dir ; do |
59 | if test -f $dir/nss/nss.h ; then | 63 | if test -f $dir/nss/nss.h ; then |
60 | @@ -735,7 +735,7 @@ | 64 | @@ -761,7 +761,7 @@ if test "z$NSS_FOUND" = "zno" ; then |
61 | OLD_CPPFLAGS=$CPPFLAGS | 65 | OLD_CPPFLAGS=$CPPFLAGS |
62 | CPPFLAGS="$NSS_CFLAGS" | 66 | CPPFLAGS="$NSPR_CFLAGS $NSS_CFLAGS" |
63 | AC_EGREP_CPP(yes,[ | 67 | AC_EGREP_CPP(yes,[ |
64 | - #include <nss.h> | 68 | - #include <nss.h> |
65 | + #include <nss3/nss.h> | 69 | + #include <nss3/nss.h> |
diff --git a/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch b/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch index 472f1cc..af598fe 100644 --- a/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch +++ b/recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch | |||
@@ -1,3 +1,4 @@ | |||
1 | From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001 | ||
1 | From: Yulong Pei <Yulong.pei@windriver.com> | 2 | From: Yulong Pei <Yulong.pei@windriver.com> |
2 | Date: Thu, 21 Jan 2010 14:11:20 +0800 | 3 | Date: Thu, 21 Jan 2010 14:11:20 +0800 |
3 | Subject: [PATCH] force to use our own libtool | 4 | Subject: [PATCH] force to use our own libtool |
@@ -5,22 +6,21 @@ Subject: [PATCH] force to use our own libtool | |||
5 | Upstream-Status: Inappropriate [ OE specific ] | 6 | Upstream-Status: Inappropriate [ OE specific ] |
6 | 7 | ||
7 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> | 8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> |
9 | |||
8 | --- | 10 | --- |
9 | ltmain.sh | 2 +- | 11 | ltmain.sh | 2 +- |
10 | 1 files changed, 1 insertions(+), 1 deletions(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 13 | ||
12 | diff --git a/ltmain.sh b/ltmain.sh | 14 | diff --git a/ltmain.sh b/ltmain.sh |
15 | index 147d758..a61f16b 100644 | ||
13 | --- a/ltmain.sh | 16 | --- a/ltmain.sh |
14 | +++ b/ltmain.sh | 17 | +++ b/ltmain.sh |
15 | @@ -1309,7 +1309,7 @@ EOF | 18 | @@ -6969,7 +6969,7 @@ func_mode_link () |
16 | dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` | 19 | dir=$func_resolve_sysroot_result |
17 | # We need an absolute path. | 20 | # We need an absolute path. |
18 | case $dir in | 21 | case $dir in |
19 | - [\\/]* | [A-Za-z]:[\\/]*) ;; | 22 | - [\\/]* | [A-Za-z]:[\\/]*) ;; |
20 | + =* | [\\/]* | [A-Za-z]:[\\/]*) ;; | 23 | + =* | [\\/]* | [A-Za-z]:[\\/]*) ;; |
21 | *) | 24 | *) |
22 | absdir=`cd "$dir" && pwd` | 25 | absdir=`cd "$dir" && pwd` |
23 | if test -z "$absdir"; then | 26 | test -z "$absdir" && \ |
24 | -- | ||
25 | 1.6.4 | ||
26 | |||
diff --git a/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch b/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch index 2a199f4..d453569 100644 --- a/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch +++ b/recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch | |||
@@ -1,18 +1,26 @@ | |||
1 | From 83a1381e1d6bd1b5ec3df6f7c4bc1f4fe4f860b6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Thu, 15 Jun 2017 14:44:01 +0800 | ||
4 | Subject: [PATCH] xmlsec1: add new recipe | ||
5 | |||
1 | This enables the building of the examples directory | 6 | This enables the building of the examples directory |
2 | and it's installed as ptest. | 7 | and it's installed as ptest. |
3 | 8 | ||
4 | Upstream-Status: Inappropriate [ OE ptest specific ] | 9 | Upstream-Status: Inappropriate [ OE ptest specific ] |
5 | 10 | ||
6 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
12 | |||
7 | --- | 13 | --- |
8 | examples/Makefile | 7 +++++-- | 14 | examples/Makefile | 12 ++++++++++-- |
9 | 1 files changed, 7 insertions(+), 0 deletions(-) | 15 | 1 file changed, 10 insertions(+), 2 deletions(-) |
10 | 16 | ||
17 | diff --git a/examples/Makefile b/examples/Makefile | ||
18 | index 89b1d61..c1cbcca 100644 | ||
11 | --- a/examples/Makefile | 19 | --- a/examples/Makefile |
12 | +++ b/examples/Makefile | 20 | +++ b/examples/Makefile |
13 | @@ -9,9 +9,17 @@ | 21 | @@ -8,9 +8,17 @@ PROGRAMS = \ |
14 | xmldsigverify \ | 22 | decrypt1 decrypt2 decrypt3 \ |
15 | xkms-server | 23 | xmldsigverify |
16 | 24 | ||
17 | +ifndef CC | 25 | +ifndef CC |
18 | CC = gcc | 26 | CC = gcc |
diff --git a/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch index b0ced03..8b2533e 100644 --- a/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch +++ b/recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ef8872185dcd05d20c93cd98317ede1913371c94 Mon Sep 17 00:00:00 2001 | 1 | From 0c38c6864e7ba8f53a657d87894f24374a6a4932 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Tue, 30 Dec 2014 11:18:17 +0800 | 3 | Date: Tue, 30 Dec 2014 11:18:17 +0800 |
4 | Subject: [PATCH] examples: allow build in separate dir | 4 | Subject: [PATCH] examples: allow build in separate dir |
@@ -6,15 +6,16 @@ Subject: [PATCH] examples: allow build in separate dir | |||
6 | Upstream-Status: Inappropriate [ OE specific ] | 6 | Upstream-Status: Inappropriate [ OE specific ] |
7 | 7 | ||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
9 | |||
9 | --- | 10 | --- |
10 | examples/Makefile | 6 ++++-- | 11 | examples/Makefile | 6 ++++-- |
11 | 1 file changed, 4 insertions(+), 2 deletions(-) | 12 | 1 file changed, 4 insertions(+), 2 deletions(-) |
12 | 13 | ||
13 | diff --git a/examples/Makefile b/examples/Makefile | 14 | diff --git a/examples/Makefile b/examples/Makefile |
14 | index 0d72ad7..f9bccc6 100644 | 15 | index c1cbcca..3f1bd14 100644 |
15 | --- a/examples/Makefile | 16 | --- a/examples/Makefile |
16 | +++ b/examples/Makefile | 17 | +++ b/examples/Makefile |
17 | @@ -13,8 +13,10 @@ ifndef CC | 18 | @@ -12,8 +12,10 @@ ifndef CC |
18 | CC = gcc | 19 | CC = gcc |
19 | endif | 20 | endif |
20 | 21 | ||
@@ -27,6 +28,3 @@ index 0d72ad7..f9bccc6 100644 | |||
27 | 28 | ||
28 | DESTDIR = /usr/share/xmlsec1 | 29 | DESTDIR = /usr/share/xmlsec1 |
29 | install-ptest: | 30 | install-ptest: |
30 | -- | ||
31 | 1.9.1 | ||
32 | |||
diff --git a/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch b/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch index 0fe3fd7..5f967bb 100644 --- a/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch +++ b/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf1c7b17cc80a2f4dfd43f112f944f68fa5fbcd6 Mon Sep 17 00:00:00 2001 | 1 | From 1d8ae4b32bd76c19ec238f30eb9b1ee582cbe990 Mon Sep 17 00:00:00 2001 |
2 | From: Jackie Huang <jackie.huang@windriver.com> | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
3 | Date: Fri, 2 Mar 2018 01:10:58 -0800 | 3 | Date: Fri, 2 Mar 2018 01:10:58 -0800 |
4 | Subject: [PATCH] xmlsec1: fix a typo in examples/verify3.c | 4 | Subject: [PATCH] xmlsec1: fix a typo in examples/verify3.c |
@@ -6,6 +6,7 @@ Subject: [PATCH] xmlsec1: fix a typo in examples/verify3.c | |||
6 | Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/153] | 6 | Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/153] |
7 | 7 | ||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
9 | |||
9 | --- | 10 | --- |
10 | examples/verify3.c | 2 +- | 11 | examples/verify3.c | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 12 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -20,6 +21,3 @@ index 2d26ae7..68f52ab 100644 | |||
20 | * XML Security Library example: Verifying a file signed with X509 certificate | 21 | * XML Security Library example: Verifying a file signed with X509 certificate |
21 | * | 22 | * |
22 | * Verifies a file signed with X509 certificate. | 23 | * Verifies a file signed with X509 certificate. |
23 | -- | ||
24 | 2.13.0 | ||
25 | |||