From 7fffe9763b53635d96d6e3af3b8b6b918f6217f8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 Oct 2022 22:16:09 +0200 Subject: libxslt: upgrade 1.1.35 -> 1.1.37 Drop the no longer supported option. (From OE-Core rev: 587c24b7d77730bfeaf6c926e36f143e71cfb229) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-support/libxslt/libxslt_1.1.35.bb | 60 -------------------------- meta/recipes-support/libxslt/libxslt_1.1.37.bb | 60 ++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-support/libxslt/libxslt_1.1.35.bb create mode 100644 meta/recipes-support/libxslt/libxslt_1.1.37.bb (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/libxslt/libxslt_1.1.35.bb b/meta/recipes-support/libxslt/libxslt_1.1.35.bb deleted file mode 100644 index 2fd777766c..0000000000 --- a/meta/recipes-support/libxslt/libxslt_1.1.35.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "GNOME XSLT library" -DESCRIPTION = "libxslt is the XSLT C parser and toolkit developed for the Gnome project. \ -XSLT itself is a an XML language to define transformation for XML. Libxslt is based on \ -libxml2 the XML C library developed for the GNOME project. It also implements most of \ -the EXSLT set of processor-portable extensions functions and some of Saxon's evaluate \ -and expressions extensions." -HOMEPAGE = "http://xmlsoft.org/XSLT/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" - -SECTION = "libs" -DEPENDS = "libxml2" - -SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" - -SRC_URI[sha256sum] = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79" - -UPSTREAM_CHECK_REGEX = "libxslt-(?P\d+(\.\d+)+)\.tar" - -# We have libxml2 2.9.14 and we don't link statically with it anyway -# so this isn't an issue. -CVE_CHECK_IGNORE += "CVE-2022-29824" - -S = "${WORKDIR}/libxslt-${PV}" - -BINCONFIG = "${bindir}/xslt-config" - -inherit autotools pkgconfig binconfig-disabled lib_package multilib_header - -do_configure:prepend () { - # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. - # This can be removed when upgrading to 1.1.34. - sed -i -e 's/ansidecl.h//' ${S}/configure.ac - - # The timestamps in the 1.1.28 tarball are messed up causing this file to - # appear out of date. Touch it so that we don't try to regenerate it. - touch ${S}/doc/xsltproc.1 -} - -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto --with-html-subdir=${BPN}" -# older versions of this recipe had ${PN}-utils -RPROVIDES:${PN}-bin += "${PN}-utils" -RCONFLICTS:${PN}-bin += "${PN}-utils" -RREPLACES:${PN}-bin += "${PN}-utils" - -# This is only needed until libxml can load the relocated catalog itself -do_install:append:class-native () { - create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog -} - -do_install:append () { - oe_multilib_header libxslt/xsltconfig.h -} - -FILES:${PN} += "${libdir}/libxslt-plugins" -FILES:${PN}-dev += "${libdir}/xsltConf.sh" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/libxslt/libxslt_1.1.37.bb b/meta/recipes-support/libxslt/libxslt_1.1.37.bb new file mode 100644 index 0000000000..361bb0f8dc --- /dev/null +++ b/meta/recipes-support/libxslt/libxslt_1.1.37.bb @@ -0,0 +1,60 @@ +SUMMARY = "GNOME XSLT library" +DESCRIPTION = "libxslt is the XSLT C parser and toolkit developed for the Gnome project. \ +XSLT itself is a an XML language to define transformation for XML. Libxslt is based on \ +libxml2 the XML C library developed for the GNOME project. It also implements most of \ +the EXSLT set of processor-portable extensions functions and some of Saxon's evaluate \ +and expressions extensions." +HOMEPAGE = "http://xmlsoft.org/XSLT/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" + +SECTION = "libs" +DEPENDS = "libxml2" + +SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" + +SRC_URI[sha256sum] = "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4" + +UPSTREAM_CHECK_REGEX = "libxslt-(?P\d+(\.\d+)+)\.tar" + +# We have libxml2 2.9.14 and we don't link statically with it anyway +# so this isn't an issue. +CVE_CHECK_IGNORE += "CVE-2022-29824" + +S = "${WORKDIR}/libxslt-${PV}" + +BINCONFIG = "${bindir}/xslt-config" + +inherit autotools pkgconfig binconfig-disabled lib_package multilib_header + +do_configure:prepend () { + # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. + # This can be removed when upgrading to 1.1.34. + sed -i -e 's/ansidecl.h//' ${S}/configure.ac + + # The timestamps in the 1.1.28 tarball are messed up causing this file to + # appear out of date. Touch it so that we don't try to regenerate it. + touch ${S}/doc/xsltproc.1 +} + +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" +# older versions of this recipe had ${PN}-utils +RPROVIDES:${PN}-bin += "${PN}-utils" +RCONFLICTS:${PN}-bin += "${PN}-utils" +RREPLACES:${PN}-bin += "${PN}-utils" + +# This is only needed until libxml can load the relocated catalog itself +do_install:append:class-native () { + create_wrapper ${D}/${bindir}/xsltproc XML_CATALOG_FILES=${sysconfdir}/xml/catalog +} + +do_install:append () { + oe_multilib_header libxslt/xsltconfig.h +} + +FILES:${PN} += "${libdir}/libxslt-plugins" +FILES:${PN}-dev += "${libdir}/xsltConf.sh" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf