diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2022-11-02 14:51:25 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-11-07 08:39:05 -0800 |
commit | 43e39eb9c1c575b5d077d73f9d565bc7d9546ddf (patch) | |
tree | 59ffa50ebf698067756103a60ebb0a7b1e273691 | |
parent | 721ed41c3380df4d77074a1c85840aa1029b0202 (diff) | |
download | meta-openembedded-43e39eb9c1c575b5d077d73f9d565bc7d9546ddf.tar.gz |
xmlsec1: upgrade 1.2.34 -> 1.2.36
makefile-ptest.patch
xmlsec1-examples-allow-build-in-separate-dir.patch
refreshed for new version.
Changelog:
===========
Retired the XMLSec mailing list "xmlsec@aleksey.com" and the XMLSec Online Signature Verifier.
Migration to OpenSSL 3.0 API (based on PR by @snargit). Note that OpenSSL engines are disabled by default when XMLSec library is compiled against OpenSSL 3.0. To re-enable OpenSSL engines, use "--enable-openssl3-engines" configure flag (there will be a lot of deprecation warnings).
The OpenSSL before 1.1.0 and LibreSSL before 2.7.0 are now deprecated and will be removed in the future versions of XMLSec Library.
Refactored all the integer casts to ensure cast-safety. Fixed all warnings and enabled "-Werror" and "-pedantic" flags on CI builds.
Added configure flag to use size_t for xmlSecSize (currently disabled by default for backward compatibility).
Moved all CI builds to GitHub actions.
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.36.bb (renamed from meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.34.bb) | 2 |
3 files changed, 15 insertions, 11 deletions
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch index d45356924b..26ebce343d 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch | |||
@@ -9,13 +9,12 @@ and it's installed as ptest. | |||
9 | Upstream-Status: Inappropriate [ OE ptest specific ] | 9 | Upstream-Status: Inappropriate [ OE ptest specific ] |
10 | 10 | ||
11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> | 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
12 | |||
13 | --- | 12 | --- |
14 | examples/Makefile | 12 ++++++++++-- | 13 | examples/Makefile | 12 ++++++++++-- |
15 | 1 file changed, 10 insertions(+), 2 deletions(-) | 14 | 1 file changed, 10 insertions(+), 2 deletions(-) |
16 | 15 | ||
17 | diff --git a/examples/Makefile b/examples/Makefile | 16 | diff --git a/examples/Makefile b/examples/Makefile |
18 | index 89b1d61..c1cbcca 100644 | 17 | index 02480c2..cbc2661 100644 |
19 | --- a/examples/Makefile | 18 | --- a/examples/Makefile |
20 | +++ b/examples/Makefile | 19 | +++ b/examples/Makefile |
21 | @@ -8,9 +8,17 @@ PROGRAMS = \ | 20 | @@ -8,9 +8,17 @@ PROGRAMS = \ |
@@ -24,12 +23,12 @@ index 89b1d61..c1cbcca 100644 | |||
24 | 23 | ||
25 | +ifndef CC | 24 | +ifndef CC |
26 | CC = gcc | 25 | CC = gcc |
27 | -CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS | 26 | -CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS -Wall -Wextra |
28 | -LDLIBS += -g $(shell xmlsec1-config --libs) | 27 | -LDLIBS += -g $(shell xmlsec1-config --libs) |
29 | +endif | 28 | +endif |
30 | + | 29 | + |
31 | +CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS | 30 | +CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra |
32 | +LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) | 31 | +LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) |
33 | + | 32 | + |
34 | +DESTDIR = /usr/share/xmlsec1 | 33 | +DESTDIR = /usr/share/xmlsec1 |
35 | +install-ptest: | 34 | +install-ptest: |
@@ -38,3 +37,6 @@ index 89b1d61..c1cbcca 100644 | |||
38 | 37 | ||
39 | all: $(PROGRAMS) | 38 | all: $(PROGRAMS) |
40 | 39 | ||
40 | -- | ||
41 | 2.25.1 | ||
42 | |||
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch index 8b2533ed9e..9e6a6a840f 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch | |||
@@ -6,25 +6,27 @@ 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 | |||
10 | --- | 9 | --- |
11 | examples/Makefile | 6 ++++-- | 10 | examples/Makefile | 6 ++++-- |
12 | 1 file changed, 4 insertions(+), 2 deletions(-) | 11 | 1 file changed, 4 insertions(+), 2 deletions(-) |
13 | 12 | ||
14 | diff --git a/examples/Makefile b/examples/Makefile | 13 | diff --git a/examples/Makefile b/examples/Makefile |
15 | index c1cbcca..3f1bd14 100644 | 14 | index cbc2661..e882b61 100644 |
16 | --- a/examples/Makefile | 15 | --- a/examples/Makefile |
17 | +++ b/examples/Makefile | 16 | +++ b/examples/Makefile |
18 | @@ -12,8 +12,10 @@ ifndef CC | 17 | @@ -12,8 +12,10 @@ ifndef CC |
19 | CC = gcc | 18 | CC = gcc |
20 | endif | 19 | endif |
21 | 20 | ||
22 | -CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS | 21 | -CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra |
23 | -LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) | 22 | -LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 ) |
24 | +top_srcdir = .. | 23 | +top_srcdir = .. |
25 | +top_builddir = .. | 24 | +top_builddir = .. |
26 | +CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS | 25 | +CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS -Wall -Wextra |
27 | +LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 ) | 26 | +LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 ) |
28 | 27 | ||
29 | DESTDIR = /usr/share/xmlsec1 | 28 | DESTDIR = /usr/share/xmlsec1 |
30 | install-ptest: | 29 | install-ptest: |
30 | -- | ||
31 | 2.25.1 | ||
32 | |||
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.34.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.36.bb index 3e8772ed69..370551b159 100644 --- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.34.bb +++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.2.36.bb | |||
@@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ | |||
22 | file://ensure-search-path-non-host.patch \ | 22 | file://ensure-search-path-non-host.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[sha256sum] = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262" | 25 | SRC_URI[sha256sum] = "f0d97e008b211d85808f038326d42e7f5cf46648e176f07406a323e7e8d41c80" |
26 | 26 | ||
27 | inherit autotools-brokensep ptest pkgconfig | 27 | inherit autotools-brokensep ptest pkgconfig |
28 | 28 | ||