summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Schollmeyer <nex+b-g-o@nexadn.de>2022-11-05 20:23:46 +0100
committerFlorian Schmaus <flow@gentoo.org>2022-11-06 12:04:24 +0100
commitca475f37660c940516572a8c4eee6ec0e017c0f1 (patch)
tree9aa16ec322d28ebd7ccbf93329aeb897f40cbf71 /dev-libs/libstrophe
parentdev-libs/libstrophe: drop 0.12.0, 0.12.1 (diff)
downloadgentoo-ca475f37660c940516572a8c4eee6ec0e017c0f1.tar.gz
gentoo-ca475f37660c940516572a8c4eee6ec0e017c0f1.tar.bz2
gentoo-ca475f37660c940516572a8c4eee6ec0e017c0f1.zip
dev-libs/libstrophe: Backport /bin/sh -> dash fix
Closes: https://bugs.gentoo.org/877049 Closes: https://bugs.gentoo.org/879533 Signed-off-by: Adrian Schollmeyer <nex+b-g-o@nexadn.de> Closes: https://github.com/gentoo/gentoo/pull/28148 Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'dev-libs/libstrophe')
-rw-r--r--dev-libs/libstrophe/Manifest1
-rw-r--r--dev-libs/libstrophe/libstrophe-0.12.2.ebuild11
2 files changed, 11 insertions, 1 deletions
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest
index 6d9439ad1757..2ef97da97df0 100644
--- a/dev-libs/libstrophe/Manifest
+++ b/dev-libs/libstrophe/Manifest
@@ -1 +1,2 @@
DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086
+DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
index a491acaf81f5..fcfff76abb4f 100644
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
+++ b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild
@@ -4,7 +4,11 @@
EAPI=7
DESCRIPTION="A simple, lightweight C library for writing XMPP clients"
HOMEPAGE="http://strophe.im/libstrophe/"
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz"
+# 2nd SRC is a backport of the /bin/sh -> dash fix, #877049, #879533
+SRC_URI="
+ https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz
+ https://github.com/strophe/libstrophe/commit/7352bd5cdbacf98771fdc0d32a606c4b6718077c.patch -> ${PN}-fix-configure-bashisms.patch
+"
LICENSE="|| ( MIT GPL-3 )"
# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME
SLOT="0/0.1"
@@ -25,6 +29,11 @@ BDEPEND="
DOCS=( ChangeLog )
+PATCHES=(
+ # https://github.com/strophe/libstrophe/pull/218
+ "${DISTDIR}/${PN}-fix-configure-bashisms.patch"
+)
+
src_configure() {
# shellcheck disable=SC2207
local myeconf=(