onigurama: update to v6.9.4
PATCH 1/2 onigurama: update to v6.9.4
The version meta-oe is carrying is more than 4 years old, from 2015, with numerous CVEs fixed and more than 2000 commits since.
The license checksum changed because it contains the year (which is at 2019 now).
Onigurama can now also be built using CMake, but for now this recipe stays with using autotools as only autotools builds support testing (which the next patch adds support for).
--- .../onig/files/configure.patch | 13 ------ .../files/do-not-use-system-headers.patch | 44 ------------------- ...t-link-against-host-system-libraries.patch | 42 ++++++++++++++++++ meta-oe/recipes-support/onig/onig_5.9.6.bb | 19 -------- meta-oe/recipes-support/onig/onig_6.9.4.bb | 22 ++++++++++ 5 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb
meta-oe/recipes-support/onig/files/configure.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=================================================================== ---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - -
meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted +0 -44
44 lines not on this page · raw message
meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file +42 -0
42 lines not on this page · raw message
meta-oe/recipes-support/onig/onig_5.9.6.bb deleted +0 -19
@@ -1,19 +0,0 @@ -DESCRIPTION = "Regular expressions library. The characteristics of this \ -library is that different character encoding for every regular expression \ -object can be specified." -HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" - -SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ - file://do-not-use-system-headers.patch \ - file://configure.patch" - -SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830" -SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7" - -BINCONFIG = "${bindir}/onig-config" - -inherit autotools binconfig-disabled - -BBCLASSEXTEND = "native"
meta-oe/recipes-support/onig/onig_6.9.4.bb new file +22 -0
@@ -0,0 +1,22 @@ +SUMMART = "Regular expressions library" +DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \ +It encompasses features from different regular expression \ +implementations that traditionally exist in different languages. \ +Character encoding can be specified per regular expression object." +HOMEPAGE = "https://github.com/kkos/oniguruma" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" + +SRC_URI = "\ + https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-build-don-t-link-against-host-system-libraries.patch \ +" + +SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879" +SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53" + +BINCONFIG = "${bindir}/onig-config" + +inherit autotools binconfig-disabled + +BBCLASSEXTEND = "native"
Signature · 1 line
2.23.0.rc1
PATCH 2/2 onigurama: enable ptest
--- ...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++ meta-oe/recipes-support/onig/onig/run-ptest | 48 +++++++++++++++++++ meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++- 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> +Date: Mon, 6 Jan 2020 15:10:30 +0000 +Subject: [PATCH] build: enable serial-tests automake option (for ptest) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For ptest, we need to be able to compile the tests without +running them. + +Enabling the serial-tests automake option will add +buildtest-TESTS and runtest-TESTS makefile targets, the +former being what we want. + +Signed-off-by: André Draszik <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ac51e85..48e63ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4) + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wno-portability]) ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests]) + AC_CONFIG_HEADERS([src/config.h]) + + +-- +2.23.0.rc1 +
meta-oe/recipes-support/onig/onig/run-ptest new file +48 -0
48 lines not on this page · raw message
meta-oe/recipes-support/onig/onig_6.9.4.bb +11 -1
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" SRC_URI = "\ https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ file://0001-build-don-t-link-against-host-system-libraries.patch \ + file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f BINCONFIG = "${bindir}/onig-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled ptest BBCLASSEXTEND = "native" + +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* +}
Signature · 1 line
2.23.0.rc1
PATCH v2 2/2 onigurama: enable ptest
All tests (with 3400 subtests) are passing (on musl+arm).
---
v2:
* remove useless line in run-ptest
* update commit message
--- ...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++ meta-oe/recipes-support/onig/onig/run-ptest | 47 +++++++++++++++++++ meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++- 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> +Date: Mon, 6 Jan 2020 15:10:30 +0000 +Subject: [PATCH] build: enable serial-tests automake option (for ptest) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For ptest, we need to be able to compile the tests without +running them. + +Enabling the serial-tests automake option will add +buildtest-TESTS and runtest-TESTS makefile targets, the +former being what we want. + +Signed-off-by: André Draszik <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ac51e85..48e63ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4) + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wno-portability]) ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests]) + AC_CONFIG_HEADERS([src/config.h]) + + +-- +2.23.0.rc1 +
meta-oe/recipes-support/onig/onig/run-ptest new file +47 -0
47 lines not on this page · raw message
meta-oe/recipes-support/onig/onig_6.9.4.bb +11 -1
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" SRC_URI = "\ https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ file://0001-build-don-t-link-against-host-system-libraries.patch \ + file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f BINCONFIG = "${bindir}/onig-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled ptest BBCLASSEXTEND = "native" + +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* +}
Signature · 1 line
2.23.0.rc1
PATCH v2 1/2 oniguruma: update to v6.9.4
In reply to André DraszikThe version meta-oe is carrying is more than 4 years old, from 2015, with numerous CVEs fixed and more than 2000 commits since.
The license checksum changed because it contains the year (which is at 2019 now).
Onigurama can now also be built using CMake, but for now this recipe stays with using autotools as only autotools builds support testing (which the next patch adds support for).
---
v2:
* fix typo in subject line
* fix SUMMARY
--- .../onig/files/configure.patch | 13 ------ .../files/do-not-use-system-headers.patch | 44 ------------------- ...t-link-against-host-system-libraries.patch | 42 ++++++++++++++++++ meta-oe/recipes-support/onig/onig_5.9.6.bb | 19 -------- meta-oe/recipes-support/onig/onig_6.9.4.bb | 22 ++++++++++ 5 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bb
meta-oe/recipes-support/onig/files/configure.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=================================================================== ---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - -
meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted +0 -44
44 lines not on this page · raw message
meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file +42 -0
42 lines not on this page · raw message
meta-oe/recipes-support/onig/onig_5.9.6.bb deleted +0 -19
@@ -1,19 +0,0 @@ -DESCRIPTION = "Regular expressions library. The characteristics of this \ -library is that different character encoding for every regular expression \ -object can be specified." -HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" - -SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz \ - file://do-not-use-system-headers.patch \ - file://configure.patch" - -SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830" -SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7" - -BINCONFIG = "${bindir}/onig-config" - -inherit autotools binconfig-disabled - -BBCLASSEXTEND = "native"
meta-oe/recipes-support/onig/onig_6.9.4.bb new file +22 -0
@@ -0,0 +1,22 @@ +SUMMARY = "Regular expressions library" +DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \ +It encompasses features from different regular expression \ +implementations that traditionally exist in different languages. \ +Character encoding can be specified per regular expression object." +HOMEPAGE = "https://github.com/kkos/oniguruma" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" + +SRC_URI = "\ + https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-build-don-t-link-against-host-system-libraries.patch \ +" + +SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879" +SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53" + +BINCONFIG = "${bindir}/onig-config" + +inherit autotools binconfig-disabled + +BBCLASSEXTEND = "native"
Signature · 1 line
2.23.0.rc1
PATCH v3 2/2 oniguruma: enable ptest
In reply to André DraszikAll tests (with 3400 subtests) are passing (on musl+arm).
---
v3:
* fix subject line
v2:
* remove useless line in run-ptest
* update commit message
--- ...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++ meta-oe/recipes-support/onig/onig/run-ptest | 47 +++++++++++++++++++ meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++- 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch create mode 100755 meta-oe/recipes-support/onig/onig/run-ptest
meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch new file +36 -0
@@ -0,0 +1,36 @@ +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> +Date: Mon, 6 Jan 2020 15:10:30 +0000 +Subject: [PATCH] build: enable serial-tests automake option (for ptest) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For ptest, we need to be able to compile the tests without +running them. + +Enabling the serial-tests automake option will add +buildtest-TESTS and runtest-TESTS makefile targets, the +former being what we want. + +Signed-off-by: André Draszik <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ac51e85..48e63ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4) + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wno-portability]) ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests]) + AC_CONFIG_HEADERS([src/config.h]) + + +-- +2.23.0.rc1 +
meta-oe/recipes-support/onig/onig/run-ptest new file +47 -0
47 lines not on this page · raw message
meta-oe/recipes-support/onig/onig_6.9.4.bb +11 -1
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" SRC_URI = "\ https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ file://0001-build-don-t-link-against-host-system-libraries.patch \ + file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"
@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f BINCONFIG = "${bindir}/onig-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled ptest BBCLASSEXTEND = "native" + +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* +}
Signature · 1 line
2.23.0.rc1
Re: [meta-oe][PATCH 2/2 v3] oniguruma: enable ptest
Khem,
I got the subject line wrong originally - not sure how that works with patchwork.
Can you still pick this up please?
Cheers,
Andre'
Quoted 144 lines · André Draszik
All tests (with 3400 subtests) are passing (on musl+arm).
Signed-off-by André Draszik <[email protected]>---
v3:
* fix subject linev2:
* remove useless line in run-ptest
* update commit message--- ...rial-tests-automake-option-for-ptest.patch | 36 ++++++++++++++ meta-oe/recipes-support/onig/onig/run-ptest | 47 +++++++++++++++++++ meta-oe/recipes-support/onig/onig_6.9.4.bb | 12 ++++- 3 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch create mode 100755 meta-oe/recipes-support/onig/onig/run-ptestmeta- renamed from meta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch +0
-0
oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patchnew file mode 100644
index 000000000..587e5ac1bmeta-oe/recipes-support/onig/onig/0001-build-enable-serial-tests-automake-option-for-ptest.patch new file +36
-0@@ -0,0 +1,36 @@ +From 8bf8189ec4a0d7ee569f66feb0e590e9602c31b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> +Date: Mon, 6 Jan 2020 15:10:30 +0000 +Subject: [PATCH] build: enable serial-tests automake option (for ptest) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For ptest, we need to be able to compile the tests without +running them. + +Enabling the serial-tests automake option will add +buildtest-TESTS and runtest-TESTS makefile targets, the +former being what we want. + +Signed-off-by: André Draszik <[email protected]> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index ac51e85..48e63ce 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ AC_INIT(onig, 6.9.4) + + AC_CONFIG_MACRO_DIR([m4]) + +-AM_INIT_AUTOMAKE([-Wno-portability]) ++AM_INIT_AUTOMAKE([-Wno-portability serial-tests]) + AC_CONFIG_HEADERS([src/config.h]) + + +-- +2.23.0.rc1 +meta-oe/recipes-support/onig/onig/run-ptest new file +47
-0@@ -0,0 +1,47 @@ +#!/bin/sh -eu + +my_cleanup() { + [ -n "${workdir:-}" ] && rm -rf "${workdir}" +} + +trap "my_cleanup" EXIT +for sig in INT TERM ; do + # We want sig to expand right here and now, as it's + # a loop variable, not when signalled. For $$ it + # doesn't matter. + # shellcheck disable=SC2064 + trap "my_cleanup ; trap - EXIT ; trap - ${sig} ; kill -s ${sig} $$" ${sig} +done + +workdir=$(mktemp -d -t onig.ptest.XXXXXX) +status="${workdir}/failed" +touch "${status}" + +find tests/ -perm -111 -type f -exec sh -c ' + workdir="${1}" + status="${2}" + t="${3}" + t_log="${workdir}/$(basename ${t}).log" + + res=0 + ./${t} > "${t_log}" 2>&1 \ + || res=$? + if [ $res -eq 0 ] ; then + echo "PASS: ${t}" + else + echo "FAIL: ${t}" + echo "$(basename ${t}): ${t_log}" >> "${status}" + fi + ' _ "${workdir}" "${status}" {} \; + +if [ $(stat -c '%s' "${status}") -ne 0 ] ; then + exec >&2 + while IFS=': ' read -r t t_log ; do + printf "\n=========================\n" + printf "ERROR: %s:\n" "${t}" + printf -- "-------------------------\n" + cat "${t_log}" + done < "${status}" +fi + +[ $(stat -c '%s' "${status}") -eq 0 ]meta-oe/recipes-support/onig/onig_6.9.4.bb +11
-1@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" SRC_URI = "\ https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ file://0001-build-don-t-link-against-host-system-libraries.patch \ + file://0001-build-enable-serial-tests-automake-option-for-ptest.patch \ + file://run-ptest \ " SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879"@@ -17,6 +19,14 @@ SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f BINCONFIG = "${bindir}/onig-config" -inherit autotools binconfig-disabled +inherit autotools binconfig-disabled ptest BBCLASSEXTEND = "native" + +do_compile_ptest() { + oe_runmake -C test buildtest-TESTS +} + +do_install_ptest() { + install -Dm0755 -t ${D}${PTEST_PATH}/tests/ ${B}/test/.libs/* +}
Re: [meta-oe][PATCH 1/2 v2] oniguruma: update to v6.9.4
In reply to André DraszikKhem,
I got the subject line wrong originally - not sure if it's too late already...
Cheers,
Andre'
Quoted 205 lines · André Draszik
The version meta-oe is carrying is more than 4 years old, from 2015, with numerous CVEs fixed and more than 2000 commits since.
The license checksum changed because it contains the year (which is at 2019 now).
Onigurama can now also be built using CMake, but for now this recipe stays with using autotools as only autotools builds support testing (which the next patch adds support for).
Signed-off-by André Draszik <[email protected]>---
v2:
* fix typo in subject line
* fix SUMMARY--- .../onig/files/configure.patch | 13 ------ .../files/do-not-use-system-headers.patch | 44 ------------------- ...t-link-against-host-system-libraries.patch | 42 ++++++++++++++++++ meta-oe/recipes-support/onig/onig_5.9.6.bb | 19 -------- meta-oe/recipes-support/onig/onig_6.9.4.bb | 22 ++++++++++ 5 files changed, 64 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-support/onig/files/configure.patch delete mode 100644 meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch create mode 100644 meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch delete mode 100644 meta-oe/recipes-support/onig/onig_5.9.6.bb create mode 100644 meta-oe/recipes-support/onig/onig_6.9.4.bbmeta-oe/recipes-support/onig/files/configure.patch deleted +0
-13@@ -1,13 +0,0 @@ -Index: onig-5.9.3/configure.in -=================================================================== ---- onig-5.9.3.orig/configure.in 2012-10-26 07:06:14.000000000 +0000 -+++ onig-5.9.3/configure.in 2014-07-18 08:02:52.701574484 +0000 -@@ -3,7 +3,7 @@ - - AC_CONFIG_MACRO_DIR([m4]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_HEADER(config.h) - -meta-oe/recipes- renamed from meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch +0
-0
support/onig/files/do-not-use-system-headers.patchdeleted file mode 100644
index b93602a26..000000000meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted +0
-5@@ -1,44 +0,0 @@ -Author: Marcin Juszkiewicz <[email protected]> - -When build on host with older eglibc (Ubuntu 12.04) build fails with: - -/tmp/OE/build/tmp-eglibc/sysroots/genericarmv8/usr/include/bits/predefs.h:23:3: error: #error "Never use<
bits/predefs.h> directly; include <stdc-predef.h> instead."meta-oe/recipes-support/onig/files/do-not-use-system-headers.patch deleted +0
-39- -Signed-off-by: Marcin Juszkiewicz <[email protected]> - -Upstream-Status: Inappropriate [embedded specific] - ---- - Makefile.am | 2 +- - sample/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- onig-5.9.3.orig/Makefile.am -+++ onig-5.9.3/Makefile.am -@@ -4,11 +4,11 @@ sampledir = $(top_srcdir)/sample - libname = libonig.la - - ACLOCAL_AMFLAGS = -I m4 - #AM_CFLAGS = -DNOT_RUBY - AM_CFLAGS = --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - SUBDIRS = . sample - - include_HEADERS = oniguruma.h oniggnu.h onigposix.h - lib_LTLIBRARIES = $(libname) ---- onig-5.9.3.orig/sample/Makefile.am -+++ onig-5.9.3/sample/Makefile.am -@@ -1,10 +1,10 @@ - noinst_PROGRAMS = encode listcap names posix simple sql syntax crnl - - libname = $(top_builddir)/libonig.la - LDADD = $(libname) --INCLUDES = -I$(top_srcdir) -I$(includedir) -+INCLUDES = -I$(top_srcdir) - - encode_SOURCES = encode.c - listcap_SOURCES = listcap.c - names_SOURCES = names.c - posix_SOURCES = posix.cmeta- renamed from meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch +0
-0
oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patchnew file mode 100644
index 000000000..891592650meta-oe/recipes-support/onig/onig/0001-build-don-t-link-against-host-system-libraries.patch new file +42
-0@@ -0,0 +1,42 @@ +From 78103ecd18efcd0966531d8718f6e94dcb7a5abf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <[email protected]> +Date: Mon, 6 Jan 2020 16:56:31 +0000 +Subject: [PATCH] build: don't link against (host) system libraries +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: André Draszik <[email protected]> +--- + sample/Makefile.am | 1 - + test/Makefile.am | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sample/Makefile.am b/sample/Makefile.am +index 22a4989..e935bf0 100644 +--- a/sample/Makefile.am ++++ b/sample/Makefile.am +@@ -3,7 +3,6 @@ + lib_onig = ../src/libonig.la + LDADD = $(lib_onig) + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CPPFLAGS = -I$(top_srcdir)/src + + if ENABLE_POSIX_API +diff --git a/test/Makefile.am b/test/Makefile.am +index 4d62568..b7a2105 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -1,7 +1,6 @@ + ## Makefile.am for Oniguruma + lib_onig = ../src/libonig.la + +-AM_LDFLAGS = -L$(prefix)/lib + AM_CFLAGS = -Wall -Wno-invalid-source-encoding + AM_CPPFLAGS = -I$(top_srcdir)/src + +-- +2.23.0.rc1 +meta-oe/recipes-support/onig/onig_5.9.6.bb deleted +0
-8@@ -1,19 +0,0 @@ -DESCRIPTION = "Regular expressions library. The characteristics of this \ -library is that different character encoding for every regular expression \ -object can be specified." -HOMEPAGE = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/" -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=0d4861b5bc0c392a5aa90d9d76ebd86f" - -SRC_URI = "https://web.archive.org/web/20150807014439/http://www.geocities.jp/kosako3/oniguruma/archive/${BP}.tar.gz\
meta-oe/recipes-support/onig/onig_5.9.6.bb deleted +0
-11- file://do-not-use-system-headers.patch \ - file://configure.patch" - -SRC_URI[md5sum] = "d08f10ea5c94919780e6b7bed1ef9830" -SRC_URI[sha256sum] = "d5642010336a6f68b7f2e34b1f1cb14be333e4d95c2ac02b38c162caf44e47a7" - -BINCONFIG = "${bindir}/onig-config" - -inherit autotools binconfig-disabled - -BBCLASSEXTEND = "native"meta-oe/recipes-support/onig/onig_6.9.4.bb new file +22
-0@@ -0,0 +1,22 @@ +SUMMARY = "Regular expressions library" +DESCRIPTION = "Oniguruma is a modern and flexible regular expressions library. \ +It encompasses features from different regular expression \ +implementations that traditionally exist in different languages. \ +Character encoding can be specified per regular expression object." +HOMEPAGE = "https://github.com/kkos/oniguruma" +LICENSE = "BSD-2-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ee043784bdce7503e619b2d1a85798b" + +SRC_URI = "\ + https://github.com/kkos/oniguruma/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-build-don-t-link-against-host-system-libraries.patch \ +" + +SRC_URI[md5sum] = "a12d2fe997b789bd87cf63799c091879" +SRC_URI[sha256sum] = "4669d22ff7e0992a7e93e116161cac9c0949cd8960d1c562982026726f0e6d53" + +BINCONFIG = "${bindir}/onig-config" + +inherit autotools binconfig-disabled + +BBCLASSEXTEND = "native"