diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-08-31 15:10:11 +0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-09-01 10:34:02 -0700 |
commit | 9449ba75eabdba9f8cc9703c273792b70263ff9a (patch) | |
tree | 1ed0792affda1aa6749050bcaeb399c80583ab64 /recipes-security/xmlsec1 | |
parent | 108cb736d9f37e534944b3d18bbc48ecaeae484a (diff) | |
download | meta-security-9449ba75eabdba9f8cc9703c273792b70263ff9a.tar.gz |
xmlsec1: upgrade 1.2.25 -> 1.2.26
Drop patch xmlsec1-fix-a-typo-in-examples-verify3.c.patch since the
issue had been fixed upstream.
Rebase patch change-finding-path-of-nss.patch
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'recipes-security/xmlsec1')
-rw-r--r-- | recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch | 107 | ||||
-rw-r--r-- | recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch | 23 | ||||
-rw-r--r-- | recipes-security/xmlsec1/xmlsec1_1.2.26.bb (renamed from recipes-security/xmlsec1/xmlsec1_1.2.25.bb) | 5 |
3 files changed, 53 insertions, 82 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 fcc63b3..1cec47f 100644 --- a/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 47379747e34f952d31af028c672940ca7859ae3c Mon Sep 17 00:00:00 2001 | 1 | From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001 |
2 | From: Yulong Pei <Yulong.pei@windriver.com> | 2 | From: Yulong Pei <Yulong.pei@windriver.com> |
3 | Date: Wed, 21 Jul 2010 22:33:43 +0800 | 3 | Date: Wed, 21 Jul 2010 22:33:43 +0800 |
4 | Subject: [PATCH] change finding path of nss and nspr | 4 | Subject: [PATCH] change finding path of nss and nspr |
@@ -7,66 +7,61 @@ Upstream-Status: Pending | |||
7 | 7 | ||
8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> | 8 | Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> |
9 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> | 9 | Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> |
10 | 10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |
11 | --- | 11 | --- |
12 | configure.ac | 12 ++++++------ | 12 | configure.ac | 20 ++++++++++---------- |
13 | 1 file changed, 6 insertions(+), 6 deletions(-) | 13 | 1 file changed, 10 insertions(+), 10 deletions(-) |
14 | 14 | ||
15 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
16 | index 3278200..6edec7d 100644 | 16 | index 951b3eb..1fdeb0f 100644 |
17 | --- a/configure.ac | 17 | --- a/configure.ac |
18 | +++ b/configure.ac | 18 | +++ b/configure.ac |
19 | @@ -644,7 +644,7 @@ if test "z$NSS_FOUND" = "zno" ; then | 19 | @@ -866,10 +866,10 @@ MOZILLA_MIN_VERSION="1.4" |
20 | NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss" | ||
21 | NSPR_PACKAGE=mozilla-nspr | ||
22 | NSS_PACKAGE=mozilla-nss | ||
23 | -NSPR_INCLUDE_MARKER="nspr/nspr.h" | ||
24 | +NSPR_INCLUDE_MARKER="nspr.h" | ||
25 | NSPR_LIB_MARKER="libnspr4$shrext" | ||
26 | NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" | ||
27 | -NSS_INCLUDE_MARKER="nss/nss.h" | ||
28 | +NSS_INCLUDE_MARKER="nss3/nss.h" | ||
29 | NSS_LIB_MARKER="libnss3$shrext" | ||
30 | NSS_LIBS_LIST="-lnss3 -lsmime3" | ||
20 | 31 | ||
21 | if test "z$with_nspr" != "z" ; then | 32 | @@ -898,24 +898,24 @@ fi |
22 | NSPR_PREFIX="$with_nspr" | 33 | dnl Priority 1: User specifies the path to installation |
23 | - NSPR_CFLAGS="-I$with_nspr/include -I$with_nspr/include/nspr" | 34 | if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then |
24 | + NSPR_CFLAGS="-I$with_nspr/usr/include -I$with_nspr/usr/include/nspr4" | 35 | AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) |
25 | if test "z$with_gnu_ld" = "zyes" ; then | 36 | - if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then |
26 | NSPR_LIBS="-Wl,-rpath-link -Wl,$with_nspr/lib -L$with_nspr/lib $NSPR_LIBS_LIST" | 37 | - NSPR_INCLUDE_PATH="$with_nspr/include" |
27 | else | 38 | - NSPR_LIB_PATH="$with_nspr/lib" |
28 | @@ -652,7 +652,7 @@ if test "z$NSS_FOUND" = "zno" ; then | 39 | + if test -f "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then |
29 | fi | 40 | + NSPR_INCLUDE_PATH="$with_nspr/usr/include" |
30 | NSPR_INCLUDES_FOUND="yes" | 41 | + NSPR_LIB_PATH="$with_nspr/${libdir}" |
31 | NSPR_LIBS_FOUND="yes" | 42 | NSPR_FOUND="yes" |
32 | - NSPR_PRINIT_H="$with_nspr/include/prinit.h" | 43 | AC_MSG_RESULT([yes]) |
33 | + NSPR_PRINIT_H="$with_nspr/usr/include/nspr4/prinit.h" | ||
34 | else | 44 | else |
35 | for dir in $ac_nss_inc_dir ; do | 45 | - AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) |
36 | if test -f $dir/nspr/prinit.h ; then | 46 | + AC_MSG_ERROR([not found: "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) |
37 | @@ -690,7 +690,7 @@ if test "z$NSS_FOUND" = "zno" ; then | 47 | fi |
38 | OLD_CPPFLAGS=$CPPFLAGS | 48 | fi |
39 | CPPFLAGS="$NSPR_CFLAGS" | 49 | if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then |
40 | AC_EGREP_CPP(yes,[ | 50 | AC_MSG_CHECKING(for nss library installation in "$with_nss" folder) |
41 | - #include <prinit.h> | 51 | - if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then |
42 | + #include <nspr4/prinit.h> | 52 | - NSS_INCLUDE_PATH="$with_nss/include" |
43 | #if PR_VMAJOR >= 4 | 53 | - NSS_LIB_PATH="$with_nss/lib" |
44 | yes | 54 | + if test -f "$with_nss/usr/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then |
45 | #endif | 55 | + NSS_INCLUDE_PATH="$with_nss/usr/include/nss3" |
46 | @@ -715,7 +715,7 @@ if test "z$NSS_FOUND" = "zno" ; then | 56 | + NSS_LIB_PATH="$with_nss/${libdir}" |
47 | NSS_NSS_H="" | 57 | NSS_FOUND="yes" |
48 | 58 | AC_MSG_RESULT([yes]) | |
49 | if test "z$with_nss" != "z" ; then | ||
50 | - NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/include -I$with_nss/include/nss" | ||
51 | + NSS_CFLAGS="$NSS_CFLAGS -I$with_nss/usr/include -I$with_nss/usr/include/nss3 -I$with_nspr/usr/include/nspr4" | ||
52 | if test "z$with_gnu_ld" = "zyes" ; then | ||
53 | NSS_LIBS="$NSS_LIBS -Wl,-rpath-link -Wl,$with_nss/lib -L$with_nss/lib $NSS_LIBS_LIST" | ||
54 | else | ||
55 | @@ -723,7 +723,7 @@ if test "z$NSS_FOUND" = "zno" ; then | ||
56 | fi | ||
57 | NSS_INCLUDES_FOUND="yes" | ||
58 | NSS_LIBS_FOUND="yes" | ||
59 | - NSS_NSS_H="$with_nss/include/nss.h" | ||
60 | + NSS_NSS_H="$with_nss/usr/include/nss3/nss.h" | ||
61 | else | 59 | else |
62 | for dir in $ac_nss_inc_dir ; do | 60 | - AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) |
63 | if test -f $dir/nss/nss.h ; then | 61 | + AC_MSG_ERROR([not found: "$with_nss/usr/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) |
64 | @@ -761,7 +761,7 @@ if test "z$NSS_FOUND" = "zno" ; then | 62 | fi |
65 | OLD_CPPFLAGS=$CPPFLAGS | 63 | fi |
66 | CPPFLAGS="$NSPR_CFLAGS $NSS_CFLAGS" | 64 | |
67 | AC_EGREP_CPP(yes,[ | 65 | -- |
68 | - #include <nss.h> | 66 | 2.7.4 |
69 | + #include <nss3/nss.h> | 67 | |
70 | #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2 | ||
71 | yes | ||
72 | #endif | ||
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 deleted file mode 100644 index 5f967bb..0000000 --- a/recipes-security/xmlsec1/xmlsec1/xmlsec1-fix-a-typo-in-examples-verify3.c.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From 1d8ae4b32bd76c19ec238f30eb9b1ee582cbe990 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jackie Huang <jackie.huang@windriver.com> | ||
3 | Date: Fri, 2 Mar 2018 01:10:58 -0800 | ||
4 | Subject: [PATCH] xmlsec1: fix a typo in examples/verify3.c | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/lsh123/xmlsec/pull/153] | ||
7 | |||
8 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | ||
9 | |||
10 | --- | ||
11 | examples/verify3.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/examples/verify3.c b/examples/verify3.c | ||
15 | index 2d26ae7..68f52ab 100644 | ||
16 | --- a/examples/verify3.c | ||
17 | +++ b/examples/verify3.c | ||
18 | @@ -1,4 +1,4 @@ | ||
19 | -4/** | ||
20 | +/** | ||
21 | * XML Security Library example: Verifying a file signed with X509 certificate | ||
22 | * | ||
23 | * Verifies a file signed with X509 certificate. | ||
diff --git a/recipes-security/xmlsec1/xmlsec1_1.2.25.bb b/recipes-security/xmlsec1/xmlsec1_1.2.26.bb index 341ca08..2dbbf33 100644 --- a/recipes-security/xmlsec1/xmlsec1_1.2.25.bb +++ b/recipes-security/xmlsec1/xmlsec1_1.2.26.bb | |||
@@ -17,12 +17,11 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ | |||
17 | file://change-finding-path-of-nss.patch \ | 17 | file://change-finding-path-of-nss.patch \ |
18 | file://makefile-ptest.patch \ | 18 | file://makefile-ptest.patch \ |
19 | file://xmlsec1-examples-allow-build-in-separate-dir.patch \ | 19 | file://xmlsec1-examples-allow-build-in-separate-dir.patch \ |
20 | file://xmlsec1-fix-a-typo-in-examples-verify3.c.patch \ | ||
21 | file://run-ptest \ | 20 | file://run-ptest \ |
22 | " | 21 | " |
23 | 22 | ||
24 | SRC_URI[md5sum] = "dbbef1efc69e61bc4629650205a05b41" | 23 | SRC_URI[md5sum] = "9c4aaf9ff615a73921b9e3bf4988d878" |
25 | SRC_URI[sha256sum] = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2" | 24 | SRC_URI[sha256sum] = "8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50" |
26 | 25 | ||
27 | inherit autotools-brokensep ptest pkgconfig | 26 | inherit autotools-brokensep ptest pkgconfig |
28 | 27 | ||