| 1 |
commit: ca475f37660c940516572a8c4eee6ec0e017c0f1 |
| 2 |
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de> |
| 3 |
AuthorDate: Sat Nov 5 19:23:46 2022 +0000 |
| 4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 6 11:04:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca475f37 |
| 7 |
|
| 8 |
dev-libs/libstrophe: Backport /bin/sh -> dash fix |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/877049 |
| 11 |
Closes: https://bugs.gentoo.org/879533 |
| 12 |
Signed-off-by: Adrian Schollmeyer <nex+b-g-o <AT> nexadn.de> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/28148 |
| 14 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
| 15 |
|
| 16 |
dev-libs/libstrophe/Manifest | 1 + |
| 17 |
dev-libs/libstrophe/libstrophe-0.12.2.ebuild | 11 ++++++++++- |
| 18 |
2 files changed, 11 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/libstrophe/Manifest b/dev-libs/libstrophe/Manifest |
| 21 |
index 6d9439ad1757..2ef97da97df0 100644 |
| 22 |
--- a/dev-libs/libstrophe/Manifest |
| 23 |
+++ b/dev-libs/libstrophe/Manifest |
| 24 |
@@ -1 +1,2 @@ |
| 25 |
DIST libstrophe-0.12.2.tar.xz 400092 BLAKE2B 28b655e4bf3a279f837fd26e7c7ba34cd32053ad16be660c04d1c07b5335d805e9745cd24af584ed62f8ae44caebd8bda48473872163c122ecbcd57f042fc3db SHA512 1026f57b107a0ff8f088a5c7f1d88b3b5a35d0e6bfefb4f6eb56de37fe9fd2f554f547663a41353b7c6b01a2aa47f6cab4a9f7a7c87ba8c0c7708d7b2b4c2086 |
| 26 |
+DIST libstrophe-fix-configure-bashisms.patch 1274 BLAKE2B d9308e2687eab255f94ac2b0e030f4d0424e56c3d129f544eb75fb25addf57485de0e210afe12bad29d3b92db6bf4e7400c4152707f6316921a1f2d4aa1b9367 SHA512 a2fdea484ba4e5bce4982ae5d5699df6bf2169027e7f62865baa7a7049a264d16a9dcda05826bbd942a1cc256e8559c6dfb6883913edf7f4711f5ce2601b83c5 |
| 27 |
|
| 28 |
diff --git a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild |
| 29 |
index a491acaf81f5..fcfff76abb4f 100644 |
| 30 |
--- a/dev-libs/libstrophe/libstrophe-0.12.2.ebuild |
| 31 |
+++ b/dev-libs/libstrophe/libstrophe-0.12.2.ebuild |
| 32 |
@@ -4,7 +4,11 @@ |
| 33 |
EAPI=7 |
| 34 |
DESCRIPTION="A simple, lightweight C library for writing XMPP clients" |
| 35 |
HOMEPAGE="http://strophe.im/libstrophe/" |
| 36 |
-SRC_URI="https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 37 |
+# 2nd SRC is a backport of the /bin/sh -> dash fix, #877049, #879533 |
| 38 |
+SRC_URI=" |
| 39 |
+ https://github.com/strophe/${PN}/releases/download/${PV}/${P}.tar.xz |
| 40 |
+ https://github.com/strophe/libstrophe/commit/7352bd5cdbacf98771fdc0d32a606c4b6718077c.patch -> ${PN}-fix-configure-bashisms.patch |
| 41 |
+" |
| 42 |
LICENSE="|| ( MIT GPL-3 )" |
| 43 |
# Subslot: ${SONAME}.1 to differentiate from previous versions without SONAME |
| 44 |
SLOT="0/0.1" |
| 45 |
@@ -25,6 +29,11 @@ BDEPEND=" |
| 46 |
|
| 47 |
DOCS=( ChangeLog ) |
| 48 |
|
| 49 |
+PATCHES=( |
| 50 |
+ # https://github.com/strophe/libstrophe/pull/218 |
| 51 |
+ "${DISTDIR}/${PN}-fix-configure-bashisms.patch" |
| 52 |
+) |
| 53 |
+ |
| 54 |
src_configure() { |
| 55 |
# shellcheck disable=SC2207 |
| 56 |
local myeconf=( |
Archives