diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /gnome-base/orbit | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'gnome-base/orbit')
-rw-r--r-- | gnome-base/orbit/Manifest | 8 | ||||
-rw-r--r-- | gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch | 99 | ||||
-rw-r--r-- | gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch | 22 | ||||
-rw-r--r-- | gnome-base/orbit/files/orbit-2.14.19-fPIC.patch | 46 | ||||
-rw-r--r-- | gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch | 29 | ||||
-rw-r--r-- | gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch | 25 | ||||
-rw-r--r-- | gnome-base/orbit/metadata.xml | 12 | ||||
-rw-r--r-- | gnome-base/orbit/orbit-2.14.19-r5.ebuild | 100 |
8 files changed, 341 insertions, 0 deletions
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest new file mode 100644 index 000000000000..2575b705080a --- /dev/null +++ b/gnome-base/orbit/Manifest @@ -0,0 +1,8 @@ +AUX orbit-2.14.19-aix-func_data.patch 3631 BLAKE2B 10f94d0ee3203beb142f265a5f239fef31215163e8afc71561b08a4703f1938729d5041212641e204bc3eaedd162763c3e536afcf9d2ceabec496d934f0f075c SHA512 2b4414e1443a8d03c163677334f974664c2f64ccd100442f0d4a7dda61677fac397085deba9c36f0c1e70d3ab36f033d6f23d2d2c5ebaa4412bfed631783382b +AUX orbit-2.14.19-automake-1.13.patch 674 BLAKE2B 8e6b8b79001c041334d1ed7164ee1944c06131596bdc2303b376f2a6e501e1f8ffdc09eba4d79e059699f1ebb2ce30653ea627cfbe5a0f520f11e3d54ced40d5 SHA512 a49043dd50d09893828ca5f71e4af4054ec68b322b244c1f5ce7eb0a471ddb9b099c9939c0a4d6b036d4e28a163e23ec29896baa2fffc137269fd61d34bce447 +AUX orbit-2.14.19-fPIC.patch 1650 BLAKE2B a6a28a41ef14e633d472142183722d881061ec1d6a70f3777247c3b75fb7b6c0aef88bbdb456bddda5eb03df32f9b7b7aae9dc1a641ea611fd4fd91b087c2f82 SHA512 31915edd0998b4738a5c97a74b4e4f84ac80a7db5a04e1f205ff2a2ea181df9bf471a839f75bef8bc96644c0e3c731e3cf6c47bedbccd07ab7b10f27e8e19da8 +AUX orbit-2.14.19-link_protocol_is_local.patch 1006 BLAKE2B 927492b912c5f8e557a3d4bb922b8250206c7359907cd330d0f55ac30d9955dc93c110018b55f0d093191396b694c46553c8b5a0d227a3bb805c03c8e09d38f3 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8 +AUX orbit-2.14.19-parallel-build.patch 963 BLAKE2B 578f51e904cbaaa40d27b9c1a512958b34edb63ae0936edf1abaf25e29142c92250bb9b56d22583a28a6aad8266947f788b430bb869a57a82e4a1349a0fa312f SHA512 f38605716bc0c72ba87be108ad7dd3f86779fd548183abe847b74a74ad009778b42ebfc8bee0d97033f698ad28b6e383708c6033725568f37226a6de1221c187 +DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e +EBUILD orbit-2.14.19-r5.ebuild 2998 BLAKE2B 0d47817a405617d7a8193f208fd8cf916af4ebe1c0b222692d2ca4efa4c96cb9aa063faa20f65f5a0540ad5240dabf78633568dfd70e819a7185573468511241 SHA512 548690d5fd7e1120b61d7b0472cf848ddbda09f4727c42659630d35e34f64dbaa8830432f7b2382d1d4af6a9508ea548ae9cdbb028b131f9e82d6e2b7da8811e +MISC metadata.xml 359 BLAKE2B e60465ce144792058da10587759ba4c1ca3d754b29aa0be28b12efe72eb0616f5b25969f1102612ff37cbe296e0093e0fab0417800ee1efaef6fdf6941800f1f SHA512 07fe8b368b9f16c31d09701b1b1f6714ea3a305f9578705681b212d442e2e216a2d5649e9c76195f004f782a6e32e1eb94a8d9742e6593ce1bd76a7a8af6f385 diff --git a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch new file mode 100644 index 000000000000..b58fd00a10b8 --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch @@ -0,0 +1,99 @@ +From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Thu, 26 Jun 2014 12:45:18 +0200 +Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX + +--- + include/orbit/orb-core/allocators.h | 2 +- + src/idl-compiler/orbit-idl-utils.c | 14 +++++++------- + src/idl-compiler/orbit-idl2.h | 4 ++-- + 3 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h +index 0401a15..1861ca1 100644 +--- a/include/orbit/orb-core/allocators.h ++++ b/include/orbit/orb-core/allocators.h +@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer old, + Below, some magic values of the fnc ptr are defined. + **/ + typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem, +- gpointer func_data); ++ gpointer gfunc_data); + + #define ORBIT_MEMHOW_HOW(how) ((how) & 0x3) + #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2) +diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c +index 3bb0467..04fe4a2 100644 +--- a/src/idl-compiler/orbit-idl-utils.c ++++ b/src/idl-compiler/orbit-idl-utils.c +@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level) + + static void + IDL_tree_traverse_helper(IDL_tree p, GFunc f, +- gconstpointer func_data, ++ gconstpointer gfunc_data, + GHashTable *visited_nodes, + gboolean include_self) + { +@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f, + for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem; + curitem = IDL_LIST (curitem).next) { + IDL_tree_traverse_helper (IDL_get_parent_node +- (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE); ++ (IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE); + } + + if (include_self) +- f(p, (gpointer)func_data); ++ f(p, (gpointer)gfunc_data); + } + + void + IDL_tree_traverse_parents_full (IDL_tree p, + GFunc f, +- gconstpointer func_data, ++ gconstpointer gfunc_data, + gboolean include_self) + { + GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal); +@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree p, + if (!p) + return; + +- IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self); ++ IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self); + + g_hash_table_destroy (visited_nodes); + } +@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree p, + void + IDL_tree_traverse_parents (IDL_tree p, + GFunc f, +- gconstpointer func_data) ++ gconstpointer gfunc_data) + { +- IDL_tree_traverse_parents_full (p, f, func_data, TRUE); ++ IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE); + } + + /* For use by below function */ +diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h +index b58f57f..670e072 100644 +--- a/src/idl-compiler/orbit-idl2.h ++++ b/src/idl-compiler/orbit-idl2.h +@@ -16,10 +16,10 @@ void orbit_idl_print_node (IDL_tree node, + int indent_level); + void IDL_tree_traverse_parents (IDL_tree p, + GFunc f, +- gconstpointer func_data); ++ gconstpointer gfunc_data); + void IDL_tree_traverse_parents_full (IDL_tree p, + GFunc f, +- gconstpointer func_data, ++ gconstpointer gfunc_data, + gboolean include_self); + gboolean orbit_cbe_type_contains_complex (IDL_tree ts); + void orbit_idl_check_oneway_op (IDL_tree op); +-- +1.8.3.2 + diff --git a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch new file mode 100644 index 000000000000..fcfeefba08cb --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch @@ -0,0 +1,22 @@ + test/everything/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am +index 32beb36..1eef7ac 100644 +--- a/test/everything/Makefile.am ++++ b/test/everything/Makefile.am +@@ -73,12 +73,12 @@ server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src) + + IDL_FLAGS= --showcpperrors --add-imodule + IDL_FILES= everything.idl +-include $(top_srcdir)/Makefile.shared ++include ../../Makefile.shared + + BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c + CLEANFILES = ${BUILT_SOURCES} iorfile + +-TESTS = $(srcdir)/test.sh ++TESTS = test.sh + + EXTRA_DIST = $(IDL_FILES) test.sh $(included_src) + diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch new file mode 100644 index 000000000000..394919f98568 --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch @@ -0,0 +1,46 @@ +From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sun, 3 Mar 2013 13:29:24 -0500 +Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC + +Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161 +--- + configure.in | 9 +++++++++ + src/services/name/Makefile.am | 1 + + 2 files changed, 10 insertions(+) + +diff --git a/configure.in b/configure.in +index 0879051..38b7b8b 100644 +--- a/configure.in ++++ b/configure.in +@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then + AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled]) + fi + ++AC_ARG_ENABLE([libname-server-pic], ++ [AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])]) ++if test x$enable_libname_server_pic = xyes; then ++ LIBNAME_SERVER_PIC=$lt_prog_compiler_pic ++else ++ LIBNAME_SERVER_PIC= ++fi ++AC_SUBST(LIBNAME_SERVER_PIC) ++ + AC_MSG_CHECKING(which idl compiler to use) + IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)" + AC_ARG_WITH(idl-compiler, +diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am +index 7212557..21b7365 100644 +--- a/src/services/name/Makefile.am ++++ b/src/services/name/Makefile.am +@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS) + libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \ + name-support.c name-support.h + libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h ++libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC) + + orbit_name_server_2_SOURCES = boot.c + orbit_name_server_2_LDFLAGS = $(FLAGS) +-- +1.8.1.5 + diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch new file mode 100644 index 000000000000..2344935f46d2 --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch @@ -0,0 +1,29 @@ +From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 12 Feb 2013 00:27:41 -0500 +Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some + ipv6-enabled machines + +Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one, +by setting hints.ai_family before calling getaddrinfo(). + +https://bugzilla.gnome.org/show_bug.cgi?id=693636 +--- + linc2/src/linc-protocols.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c +index e6895f4..22a77aa 100644 +--- a/linc2/src/linc-protocols.c ++++ b/linc2/src/linc-protocols.c +@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto, + memset(&hints, 0, sizeof(hints)); + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_CANONNAME; ++ hints.ai_family = proto->family; + + if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) { + if (!warned++) +-- +1.8.1.2 + diff --git a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch new file mode 100644 index 000000000000..113b90465bae --- /dev/null +++ b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch @@ -0,0 +1,25 @@ +From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Thu, 26 Jun 2014 12:37:59 +0200 +Subject: [PATCH 2/2] bug#732274: fix parallel build failure + +--- + src/services/name/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am +index deda1ed..8cf868e 100644 +--- a/src/services/name/Makefile.am ++++ b/src/services/name/Makefile.am +@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h + + orbit_name_server_2_SOURCES = boot.c + orbit_name_server_2_LDFLAGS = $(FLAGS) +-orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h ++orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a + orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS) + + $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h +-- +1.8.3.2 + diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml new file mode 100644 index 000000000000..0d28a3e32644 --- /dev/null +++ b/gnome-base/orbit/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> +</maintainer> +<use> + <flag name="pic">Force libname-server-2 to be built as PIC; needed on + hardened systems</flag> +</use> +</pkgmetadata> diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild new file mode 100644 index 000000000000..927a74b0de2b --- /dev/null +++ b/gnome-base/orbit/orbit-2.14.19-r5.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +GCONF_DEBUG="yes" +GNOME_ORG_MODULE="ORBit2" +GNOME_TARBALL_SUFFIX="bz2" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 toolchain-funcs autotools multilib-minimal + +DESCRIPTION="ORBit2 is a high-performance CORBA ORB" +HOMEPAGE="https://projects.gnome.org/ORBit2/" + +LICENSE="GPL-2 LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="pic static-libs test" +REQUIRED_USE="test? ( debug )" + +RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}] + >=dev-libs/libIDL-0.8.14-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND} + dev-util/gtk-doc-am + virtual/pkgconfig +" + +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO" + +MULTILIB_WRAPPED_HEADERS=( /usr/include/orbit-2.0/orbit/orbit-config.h ) + +MULTILIB_CHOST_TOOLS=( /usr/bin/orbit2-config ) + +src_prepare() { + # Fix wrong process kill, bug #268142 + sed "s:killall lt-timeout-server:killall timeout-server:" \ + -i test/timeout.sh || die "sed 1 failed" + + # Do not mess with CFLAGS + sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed" + + if ! use test; then + sed -i -e 's/test //' Makefile.am || die + fi + + # Drop failing test, bug #331709 + sed -i -e 's/test-mem //' test/Makefile.am || die + + # Fix link_protocol_is_local() for ipv4 on machines with ipv6 + # https://bugzilla.gnome.org/show_bug.cgi?id=693636 + epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch" + + # Build libname-server-2.a with -fPIC on hardened, bug #312161 + epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch" + + epatch "${FILESDIR}"/${P}-automake-1.13.patch + epatch "${FILESDIR}"/${P}-parallel-build.patch #273031 + epatch "${FILESDIR}"/${P}-aix-func_data.patch #515094 + + eautoreconf + gnome2_src_prepare + + # we have to copy sources, there is something that causes tests + # to segfault when libs are out-of-source built. + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=() + + # We need to unset IDL_DIR, which is set by RSI's IDL. This causes certain + # files to be not found by autotools when compiling ORBit. See bug #58540 + # for more information. Please don't remove -- 8/18/06 + unset IDL_DIR + + # We need to use the hosts IDL compiler if cross-compiling, bug #262741 + if tc-is-cross-compiler; then + # check that host version is present and executable + [[ -x ${EPREFIX}/usr/bin/orbit-idl-2 ]] || die "Please emerge ~${CATEGORY}/${P} on the host system first" + myconf=("${myconf[@]}" "--with-idl-compiler=${EPREFIX}/usr/bin/orbit-idl-2") + fi + gnome2_src_configure \ + $(use_enable pic libname-server-pic) \ + $(use_enable static-libs static) \ + "${myconf[@]}" +} + +multilib_src_compile() { + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_test() { + # can fail in parallel, see bug #235994 + emake -j1 check +} |