From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- sys-libs/libsmbios/Manifest | 3 +- .../files/libsmbios-2.4.3-avoid_bashisms.patch | 84 ++++++++++++++++++++++ sys-libs/libsmbios/libsmbios-2.4.3.ebuild | 4 +- 3 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 sys-libs/libsmbios/files/libsmbios-2.4.3-avoid_bashisms.patch (limited to 'sys-libs/libsmbios') diff --git a/sys-libs/libsmbios/Manifest b/sys-libs/libsmbios/Manifest index a2f83257ab2d..546912139123 100644 --- a/sys-libs/libsmbios/Manifest +++ b/sys-libs/libsmbios/Manifest @@ -1,4 +1,5 @@ AUX libsmbios-2.2.28-cppunit-tests.patch 350 BLAKE2B c735096c5fe0e33eec728e280097f9d1e97aca8942cda80d0d574f24f71f25245714dc4bf99d5b53a9613cbbf4b33d5a50cfa9482be5a2dd601b9b9a03be3940 SHA512 51cfb62fce69afaf73659a2c4c819aa3554831b48d69bc35c1b299cd2e0b4d3be7f156a2cb57912cf10f21182e49fd5ce17aad0205a25d151f55ab3e0e58ddd7 +AUX libsmbios-2.4.3-avoid_bashisms.patch 2909 BLAKE2B 426ca128f142307ea89cc5003c298518115805a518b348345f154094e34be932721aa6c880612fa7fe3473bc1156bf7c2dc1ce085dd9511ddeaf58e54d2464e1 SHA512 d2199481d87527ce7e90ca355cdfaf48a859982e67090e248034139b19ce2d61717e9887d246c7bd6b1e46f3f97cf6ec6bbdf04e3091c513221cb42d0f1431b3 DIST libsmbios-2.4.3.tar.gz 644140 BLAKE2B 684bff4f6cf755796f785e9a93d4ddbe2a1af52082cdebc27d203772a6a2a0259edb4b9d19921f90fc78b48d54700223fbc2628665b963ebcb601010ff4340ab SHA512 7f6fb36fa9653e123b416b275953fb5652025e76dac3b4ec5600168e193ea56f8ac3ea1a3b5db29d2770e73d88152d712a35bf77a9b3fc5596570fae885585ad -EBUILD libsmbios-2.4.3.ebuild 1760 BLAKE2B 0e0362a20a7c963f716413756a1297ae62c2c4d581cfc1a17e274fb6988e165bf8fda1ecbac1ac4f1f3dbf6f3c21b6f2c1388f1b40e759ec0655a08395e421b2 SHA512 93f3ce7347856ff43c4793921545bb8d5eb02ce128816539145cf18ffb66dfa4635829a0326909f2ee7405e7a0ce26771936306c11f3cd4fccd94af3919c0fe9 +EBUILD libsmbios-2.4.3.ebuild 1788 BLAKE2B 0464ade2070e0dfd522a90ce253d8e3c8b14777b697b3daabead65bb8c26c27a8c3a28a5e813ddac209eababf21df05ab06e0f3191261a43d9cde33527fcc6f2 SHA512 0dbe7b07277548244d829cc5ad549325b361c2577026ea6d26a19db270f48174893eca3670840720d7e42c0caa43eba00271422fd278d5efdad74eb03eb9f019 MISC metadata.xml 564 BLAKE2B bc9809af663bd6abb97b0fd1e91b520e3827f8d6656f774093944217907c2246bcaf55cb123dca43b2acdcee5aa24657dda9384d3f081c45e82d3c4f5e05e61e SHA512 d32499f8dc915da23ef8ce3b0f799d213d5cf700da8b80c83a94770d7fef72bc22ddbfbecf92e49c8ea0f56c4c2b718e53563a450870a77d7cdd3d3c5f610b1a diff --git a/sys-libs/libsmbios/files/libsmbios-2.4.3-avoid_bashisms.patch b/sys-libs/libsmbios/files/libsmbios-2.4.3-avoid_bashisms.patch new file mode 100644 index 000000000000..eb26ba8dca43 --- /dev/null +++ b/sys-libs/libsmbios/files/libsmbios-2.4.3-avoid_bashisms.patch @@ -0,0 +1,84 @@ +From 97b4bdc042c48001132200828fe32c08cf9265e7 Mon Sep 17 00:00:00 2001 +From: Joe Dight <17280110+joedight@users.noreply.github.com> +Date: Fri, 27 Nov 2020 20:14:24 +0000 +Subject: [PATCH 1/2] Fix configure.ac bashism + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e14ec4a..6db254f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,7 +116,7 @@ AC_PROG_INSTALL + + dnl Check for python support + AM_CONDITIONAL([HAVE_PYTHON], [false]) +-if test x$wantpython == xyes ; then ++if test x$wantpython = xyes ; then + AM_PATH_PYTHON([3.0],,[:]) + AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) + fi +-- +2.30.0 + + +From fb7585222503c48f35270ee148ad3fef762a7502 Mon Sep 17 00:00:00 2001 +From: Kerin Millar +Date: Mon, 4 Jan 2021 00:57:29 +0100 +Subject: [PATCH 2/2] Don't rely on support for indirect expansion in the shell + +POSIX does not define the indirect expansion syntax. Moreover, if going +to the trouble of executing Perl, one may as well take full advantage of +it. Address the issue by first having the shell export the variable. +Next, have Perl perform the replacement without utilising any form of +code injection. Instead, export 'var' into Perl's environment. That +way, Perl can reference the variable name as $ENV{var} and its value as +$ENV{$ENV{var}}. + +Signed-off-by: Kerin Millar +Closes: https://bugs.gentoo.org/715202 +Closes: https://github.com/dell/libsmbios/issues/89 +Signed-off-by: Lars Wendler +--- + Makefile-std | 4 ++-- + src/python/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile-std b/Makefile-std +index 7ac6fa2..dd30d68 100644 +--- a/Makefile-std ++++ b/Makefile-std +@@ -38,7 +38,7 @@ install-data-hook: + file=$(DESTDIR)/$$i ;\ + for var in $(REPLACE_VARS) ;\ + do \ +- perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|" $$file;\ ++ var="$$var" perl -p -i -e 's|^\Q$$ENV{var}\E\s*=.*|$$ENV{var}="$$ENV{$$ENV{var}}"|' $$file;\ + done ;\ + done + +@@ -48,7 +48,7 @@ install-exec-hook: + file=$(DESTDIR)/$$i ;\ + for var in $(REPLACE_VARS) ;\ + do \ +- perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|" $$file;\ ++ var="$$var" perl -p -i -e 's|^\Q$$ENV{var}\E\s*=.*|$$ENV{var}="$$ENV{$$ENV{var}}"|' $$file;\ + done ;\ + done + +diff --git a/src/python/Makefile.am b/src/python/Makefile.am +index 693b6d9..6aca968 100644 +--- a/src/python/Makefile.am ++++ b/src/python/Makefile.am +@@ -29,5 +29,5 @@ src/python/_vars.py: src/python/libsmbios_c/_vars.py configure Makefile config. + cp $< $@ + for var in $(REPLACE_VARS) ;\ + do \ +- perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|" $@;\ ++ var="$$var" perl -p -i -e 's|^\Q$$ENV{var}\E\s*=.*|$$ENV{var}="$$ENV{$$ENV{var}}"|' $@;\ + done +-- +2.30.0 + diff --git a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild index 867d00becf26..201ab1d33e82 100644 --- a/sys-libs/libsmbios/libsmbios-2.4.3.ebuild +++ b/sys-libs/libsmbios/libsmbios-2.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-2.2.28-cppunit-tests.patch" + "${FILESDIR}/${PN}-2.4.3-avoid_bashisms.patch" #715202 ) pkg_setup() { @@ -57,7 +58,6 @@ src_configure() { $(use_enable python) $(use_enable static-libs static) ) - CONFIG_SHELL="/bin/bash" \ econf "${myeconfargs[@]}" } -- cgit v1.2.3