diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
commit | 53cba99042fa967e2a93da9f8db806fe2d035543 (patch) | |
tree | 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /net-libs/libsoup | |
parent | 71deace00d1a2b091313fe137ab7092418c6f87c (diff) |
gentoo resync : 17.02.2020
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 | 99 |
3 files changed, 0 insertions, 130 deletions
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index c3c6b9eb10d3..9a8c8a53d52a 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,11 +1,8 @@ AUX 2.66.2-meson-ntlm_auth-fix.patch 873 BLAKE2B ea7f36d5cb7d9df048b6f9ecf8cf0ab24424fae6bc918a3130ae6bac8b7c03fc8b69e7c2288e9c7dae2115ecaf48e1ed1c75c2abdc704faf0bdb093f2adde17f SHA512 227015874f95e759eb8850fc139d8340cff1bb05024585d7a8fa2af60f09aca17e497e43ca2a78a15c9ce71c90c7855e5235c1abc9b41e734a922e499a44edab AUX 2.66.2-vala-0.46-compat.patch 767 BLAKE2B ff124c8ab2897b2cdbe02e3a4c90e1584f856f9254e320a828daf1d6966c87060fb654d233baa7086e740086935b49640670f2b76ed65204bdc76b66bc2924a6 SHA512 ff218cdd450130fe12e95c3c93f8762ed891444c0a8f9b1d2c77a580717fec96a856b65ff54485ed7353d9fa3e9620acfae87fd77a096f76b647c70b8d74dbfb AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095 -AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5 -DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad -EBUILD libsoup-2.58.2.ebuild 3007 BLAKE2B cc8fa9d41608878724fb64ba3f2ea5c60b93f882c3805854a329d2dbf05409ad8f1964a9ddbcbe0f8909ba770b123f63178cd1303b53403ff32b1967600e5a76 SHA512 a7dbeedcf8f44d03336a9b51f787f44d442392306b16b79a13961ff38f814a38bd5dc255b3be3849b8140c4549aee48be13d84a2e5644884c12a1b17fb5b8dbd EBUILD libsoup-2.62.3.ebuild 2921 BLAKE2B 6a14f5d15e79b4da02d367256edcb39f1a67c1924776fa7fecca2cfbcfaace3c432930b06836a161c899bf481ea603e78c3ae9443fe22bfe707ed855d53bf6e9 SHA512 2b759c494e6ca3b008156dbc790f4b46c9f363e107adc8873725a7dc046a748a7659fa952e82f2ce6baadee595d4ae8907d490accfa57ec943231c4d015d8e5b EBUILD libsoup-2.66.4.ebuild 2775 BLAKE2B 7d25d6419d78a71984c815998f0f04c4518e41845e89a7dd8c068d16df9d1be48913f2857920c2a1717b3f27f373ca714b01cd90dab626cd5fd503181b7d4d35 SHA512 fd37118f4aaf39e4ce0bea567332239676d1369f458e8b5e2ef5c06de57dce85182fd150832bd6ef5d0b069bfe3f1835a6f31065179a55c9098b5b89a075fc12 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 deleted file mode 100644 index d09d52c292a6..000000000000 --- a/net-libs/libsoup/files/libsoup-2.58.2-sparc-unaligned.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 43389753b616..000000000000 --- a/net-libs/libsoup/libsoup-2.58.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python3_6 ) -VALA_USE_DEPEND="vapigen" - -inherit gnome2 multilib-minimal python-any-r1 vala - -DESCRIPTION="An HTTP library implementation in C" -HOMEPAGE="https://wiki.gnome.org/Projects/libsoup" - -LICENSE="LGPL-2+" -SLOT="2.4" - -IUSE="debug gssapi +introspection samba ssl test vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] - >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}] - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - samba? ( net-fs/samba ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - >=dev-util/intltool-0.35 - sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] ) - vala? ( $(vala_depend) ) -" -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, -# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, -# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] -# dev-lang/php[apache2,xmlrpc] -# 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) - sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "sed failed" - fi - - # FIXME: workaround upstream not respecting --without-apache-httpd - sed -e '/check: start-httpd/d' \ - -i tests/Makefile.am tests/Makefile.in || die - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - addpredict /usr/share/snmp/mibs/.index - - multilib-minimal_src_configure -} - -multilib_src_configure() { - # Disable apache tests until they are usable on Gentoo, bug #326957 - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tls-check \ - --without-gnome \ - --without-apache-httpd \ - $(usex debug --enable-debug=yes ' ') \ - $(multilib_native_use_with gssapi) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable vala) \ - $(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth) - - if multilib_is_native_abi; then - # fix gtk-doc - ln -s "${S}"/docs/reference/html docs/reference/html || die - fi -} - -multilib_src_install() { - gnome2_src_install -} |