Package init
This commit is contained in:
dogsheng
parent
62a4bc21a5
commit
ffbebc8bf8
@ -0,0 +1,29 @@
|
||||
From 623749eb6e2a87f6a8723b68e0d224b8ea08ff60 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Rostovtsev <tetromino@gentoo.org>
|
||||
Date: Tue, 12 Feb 2013 00:27:41 -0500
|
||||
Subject: [PATCH 05/18] 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.3.1
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From 26371ccfe0728b8bdd3f8ae3109d22645e385525 Mon Sep 17 00:00:00 2001
|
||||
From: Kjartan Maraas <kmaraas@gnome.org>
|
||||
Date: Tue, 14 May 2013 13:53:52 +0200
|
||||
Subject: [PATCH 14/18] Commit patch from bug #662623 to fix connection
|
||||
failures on heavily loaded systems. Patch from Red Hat support.
|
||||
|
||||
---
|
||||
linc2/src/linc-connection.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/linc2/src/linc-connection.c b/linc2/src/linc-connection.c
|
||||
index 77bab0f..88169f9 100644
|
||||
--- a/linc2/src/linc-connection.c
|
||||
+++ b/linc2/src/linc-connection.c
|
||||
@@ -651,8 +651,12 @@ link_connection_do_initiate (LinkConnection *cnx,
|
||||
fix_permissions (service);
|
||||
}
|
||||
#endif
|
||||
-
|
||||
+retry:
|
||||
LINK_TEMP_FAILURE_RETRY_SOCKET (connect (fd, saddr, saddr_len), rv);
|
||||
+ if (rv == -1L && errno == EAGAIN) {
|
||||
+ g_usleep (10000);
|
||||
+ goto retry;
|
||||
+ }
|
||||
#ifdef HAVE_WINSOCK2_H
|
||||
if (rv == SOCKET_ERROR) {
|
||||
if ((options & LINK_CONNECTION_NONBLOCKING) &&
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
25
0016-bug-732274-fix-parallel-build-failure.patch
Normal file
25
0016-bug-732274-fix-parallel-build-failure.patch
Normal file
@ -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 16/18] 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.1
|
||||
|
||||
21
ORBit2.spec
21
ORBit2.spec
@ -1,6 +1,6 @@
|
||||
Name: ORBit2
|
||||
Version: 2.14.19
|
||||
Release: 21
|
||||
Release: 23
|
||||
Summary: A high-performance CORBA Object Request Broker
|
||||
License: LGPLv2+ and GPLv2+
|
||||
URL: http://www.gnome.org/projects/ORBit2
|
||||
@ -15,6 +15,10 @@ Patch1: ORBit2-2.14.3-ref-leaks.patch
|
||||
Patch2: ORBit2-make-j-safety.patch
|
||||
Patch3: ORBit2-allow-deprecated.patch
|
||||
|
||||
Patch6000: 0005-Fix-link_protocol_is_local_ipv46-for-ipv4-on-some-ip.patch
|
||||
Patch6001: 0014-Commit-patch-from-bug-662623-to-fix-connection-failu.patch
|
||||
Patch6002: 0016-bug-732274-fix-parallel-build-failure.patch
|
||||
|
||||
%description
|
||||
ORBit is an efficient, free C-based ORB, compliant to CORBA version 2.2. CORBA
|
||||
stands for Common Object Request Broker Architecture. CORBA in many ways is a
|
||||
@ -54,11 +58,7 @@ autoconf
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%{_libdir}/*.so.*
|
||||
@ -83,5 +83,14 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_includedir}/*
|
||||
|
||||
%changelog
|
||||
* Fri Dec 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.14.19-23
|
||||
- Fix ldconfig scriptlets
|
||||
|
||||
* Thu Dec 19 2019 YunFeng Ye <yeyunfeng@huawei.com> - 2.14.19-22
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:restart
|
||||
- DESC:backport bugfix patch
|
||||
|
||||
* Mon Aug 12 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.14.19-21
|
||||
- Package init
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user