diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
| commit | c5283d322accc6097afec74eab24550829788bab (patch) | |
| tree | b99ce668128d82a026eaa31461643f9173f9b77b /net-libs/libsoup | |
| parent | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff) | |
gentoo resync : 23.03.2018
Diffstat (limited to 'net-libs/libsoup')
| -rw-r--r-- | net-libs/libsoup/Manifest | 3 | ||||
| -rw-r--r-- | net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch | 28 | ||||
| -rw-r--r-- | net-libs/libsoup/libsoup-2.58.2.ebuild | 7 |
3 files changed, 36 insertions, 2 deletions
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index 3b141e02c56e..70c606213825 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,5 +1,6 @@ +AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de EBUILD libsoup-2.56.1.ebuild 2726 BLAKE2B d8451ad0baebc1441d8f9627107abbc78bdf965089b94b9286d951357641eeafef784cfb4f8b31a69510ed6b597a308a848edde02a6307e6a77cbbad7215a122 SHA512 342ca26d36901023c260c366b4dc97a003f88b397c803680aeb57de39129b48c8e12ad338673872ff315796da703ad782d4e473e658d690133247461a589b753 -EBUILD libsoup-2.58.2.ebuild 2883 BLAKE2B dcac3f08db61bf85a4dbc1f3a80ec5b35ad423a524ea08f2297b1d5e32172c578dbbcf7873a98cf9373089423f54f04cd8809fcbf0e22ba11a1e7f643a610317 SHA512 dee58b5e4d111f30de0d0b4bd2fbaebef7102e0ae5e33cd2bffdab7f52b6c45f8b392e4bca9ba458a36dba56bd374c6a23f4796c6e64a9c919dd5a93cd854ff5 +EBUILD libsoup-2.58.2.ebuild 2979 BLAKE2B 61c7bf36a48b52a75c4ba3c3b435193455ed61dc9d2d54c39f173086b94d88906c7298aa4624693b0fdd5748e861b5e45e0f7869a0d2b51474d16c7fc73d5891 SHA512 965ff094ebc6812b69b239eaf60ee9035d12ea730a0968b5a58c0b17f913d47fb0f0d30fe2ee2caeeab1047578571481dae680f1b0abd75437877895ad646603 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f diff --git a/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch b/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch new file mode 100644 index 000000000000..d09d52c292a6 --- /dev/null +++ b/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch @@ -0,0 +1,28 @@ +From c2aaac0083f58d285b8feb24f13fe347d7f726fe Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <eike@sf-mail.de> +Date: Sat, 17 Mar 2018 10:28:00 +0000 +Subject: [PATCH] WebSockets: Avoid unaligned memory access + +This is causing test failures in SPARC architectures. + +https://bugzilla.gnome.org/show_bug.cgi?id=794421 +--- + libsoup/soup-websocket-connection.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c +index 0258a22c..35eee6a6 100644 +--- a/libsoup/soup-websocket-connection.c ++++ b/libsoup/soup-websocket-connection.c +@@ -401,9 +401,10 @@ send_message (SoupWebsocketConnection *self, + * probably a client somewhere that's not expecting it. + */ + if (self->pv->connection_type == SOUP_WEBSOCKET_CONNECTION_CLIENT) { ++ guint32 rnd = g_random_int (); + outer[1] |= 0x80; + mask = outer + bytes->len; +- * ((guint32 *)mask) = g_random_int (); ++ memcpy (mask, &rnd, sizeof (rnd)); + bytes->len += 4; + } + diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild index 194a65bc08c0..ba2e3c642e83 100644 --- a/net-libs/libsoup/libsoup-2.58.2.ebuild +++ b/net-libs/libsoup/libsoup-2.58.2.ebuild @@ -17,7 +17,7 @@ SLOT="2.4" IUSE="debug gssapi +introspection samba ssl test vala" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] @@ -44,6 +44,11 @@ DEPEND="${RDEPEND} # net-misc/curl # net-libs/glib-networking[ssl])" +PATCHES=( + # https://bugs.gentoo.org/630516 + "${FILESDIR}/${PN}-2.58.2-sparc-unaligned.patch" +) + src_prepare() { if ! use test; then # don't waste time building tests (bug #226271) |