From 6f3b332ab440952f7388c834ee91ce3ee51e079b Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 23 Feb 2022 16:33:13 +0100 Subject: [PATCH 1/2] dev-lang/duktape: sync with ::gentoo Commit-Ref: f4b02380c6eb5d4829d3909694a93566b789e5d6 Signed-off-by: Mathieu Tortuyaux --- .../portage-stable/dev-lang/duktape/Manifest | 1 + .../dev-lang/duktape/duktape-2.7.0-r1.ebuild | 36 +++++++++++++++++++ .../files/duktape-2.7.0-respect-tc-env.patch | 24 +++++++++++++ .../dev-lang/duktape/metadata.xml | 14 ++++---- 4 files changed, 68 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-lang/duktape/files/duktape-2.7.0-respect-tc-env.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/Manifest b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/Manifest index 36de0ea070..d126ea98f5 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/Manifest @@ -1 +1,2 @@ DIST duktape-2.6.0.tar.xz 1035160 BLAKE2B 98155e1bf7e76aab37f5ccdb951d9d456df3d984ebed5058d8931e25317ffd94b4d95f08e102eb6eb2fa36ab6d2d60be6072b4101b7754e1c1440f7d6fb2c91b SHA512 d72a2aaa05391fa243861aca6ca6082f91a08b9c5d60c7b246d35d7161532b0048bb67bd8fec7996c700ee317ac2bb52e528582682e5425b0431757d8b1c5be4 +DIST duktape-2.7.0.tar.xz 1026524 BLAKE2B da5eea88758201177f32c5611a3757433ef1b0173d6430eff1f067abd7535f3e4b9c3717290fbd8475827a53f7a2a74818287a65e563f14e91761f5cd0fe30d5 SHA512 8ff5465c9c335ea08ebb0d4a06569c991b9dc4661b63e10da6b123b882e7375e82291d6b883c2644902d68071a29ccc880dae8229447cebe710c910b54496c1d diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r1.ebuild new file mode 100644 index 0000000000..27ed4c1021 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/duktape-2.7.0-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Embeddable Javascript engine" +HOMEPAGE="https://duktape.org" +SRC_URI="https://duktape.org/${P}.tar.xz" + +LICENSE="MIT" +# Upstream don't maintain binary compatibility +# https://github.com/svaarala/duktape/issues/1524 +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}"/${PN}-2.7.0-respect-tc-env.patch +) + +src_prepare() { + default + + mv Makefile.sharedlibrary Makefile || die "failed to rename makefile" +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dodir /usr/$(get_libdir) + dodir /usr/include + emake INSTALL_PREFIX="${ED}"/usr LIBDIR="/$(get_libdir)" install +} diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/files/duktape-2.7.0-respect-tc-env.patch b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/files/duktape-2.7.0-respect-tc-env.patch new file mode 100644 index 0000000000..f29f9c7073 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/files/duktape-2.7.0-respect-tc-env.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile.sharedlibrary b/Makefile.sharedlibrary +index bf5c0cb..5862b4f 100644 +--- a/Makefile.sharedlibrary ++++ b/Makefile.sharedlibrary +@@ -70,11 +70,11 @@ all: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) duktape. + # to $INSTALL_PREFIX/include on installation. + + libduktape.$(SO_REALNAME_SUFFIX): +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wall -Wextra -Wl,$(LD_SONAME_ARG),libduktape.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + + libduktaped.$(SO_REALNAME_SUFFIX): +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -g -Wall -Wextra -Os -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wall -Wextra -Wl,$(LD_SONAME_ARG),libduktaped.$(SO_SONAME_SUFFIX) \ + -o $@ $(DUKTAPE_SRCDIR)/duktape.c + + duktape.pc: +@@ -101,4 +101,4 @@ install: libduktape.$(SO_REALNAME_SUFFIX) libduktaped.$(SO_REALNAME_SUFFIX) dukt + + CCOPTS = -I./examples/cmdline + duk: +- $(CC) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)$(LIBDIR) -Wall -Wextra -Os -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(CCOPTS) -I$(INSTALL_PREFIX)/include -L$(INSTALL_PREFIX)$(LIBDIR) -Wall -Wextra -o $@ ./examples/cmdline/duk_cmdline.c -lduktape -lm diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/metadata.xml index 57e7311084..fa4a06426f 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/duktape/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-lang/duktape/metadata.xml @@ -1,11 +1,11 @@ - - thev00d00@gentoo.org - Ian Whyman - - - svaarala/duktape - + + sam@gentoo.org + Sam James + + + svaarala/duktape + From 7caf5959c6969eed641300d095d61a98d19ae4ce Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 23 Feb 2022 16:46:41 +0100 Subject: [PATCH 2/2] changelog: add entries Signed-off-by: Mathieu Tortuyaux --- .../portage-stable/changelog/security/2022-02-23-duktape.md | 1 + .../portage-stable/changelog/updates/2022-02-23-duktape.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/security/2022-02-23-duktape.md create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-23-duktape.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/security/2022-02-23-duktape.md b/sdk_container/src/third_party/portage-stable/changelog/security/2022-02-23-duktape.md new file mode 100644 index 0000000000..9e87a9a453 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/security/2022-02-23-duktape.md @@ -0,0 +1 @@ +- duktape ([CVE-2021-46322](https://nvd.nist.gov/vuln/detail/CVE-2021-46322)) diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-23-duktape.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-23-duktape.md new file mode 100644 index 0000000000..bdbdac0dca --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-02-23-duktape.md @@ -0,0 +1 @@ +- duktape ([2.7.0](https://github.com/svaarala/duktape/releases/tag/v2.7.0))