diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-23 10:22:15 +0100 |
| commit | 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch) | |
| tree | 230f3135ceaace633cf93e9838b185c4a6664c2e /net-misc/omniORB/files | |
| parent | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff) | |
gentoo resync : 23.09.2020
Diffstat (limited to 'net-misc/omniORB/files')
| -rw-r--r-- | net-misc/omniORB/files/ldflags.patch | 11 | ||||
| -rw-r--r-- | net-misc/omniORB/files/omniORB-4.1.4-format-security.patch | 16 | ||||
| -rw-r--r-- | net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch | 31 |
3 files changed, 0 insertions, 58 deletions
diff --git a/net-misc/omniORB/files/ldflags.patch b/net-misc/omniORB/files/ldflags.patch deleted file mode 100644 index 471df27ae7f4..000000000000 --- a/net-misc/omniORB/files/ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mk/beforeauto.mk.in.orig 2010-04-24 21:13:17.000000000 +0200 -+++ mk/beforeauto.mk.in 2010-04-24 21:14:24.000000000 +0200 -@@ -541,7 +541,7 @@ - SharedLibraryLibNameTemplate = lib$$1$$2.$(SHAREDLIB_SUFFIX) - SharedLibraryImplibNameTemplate = lib$$1$$2.a - --SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname -+SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname @LDFLAGS@ - - define SharedLibraryFullName - fn() { \ diff --git a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch deleted file mode 100644 index 2af8d21d308d..000000000000 --- a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ - src/tool/omniidl/cxx/cccp/cccp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c -index 0198b1a..64d80ae 100644 ---- a/src/tool/omniidl/cxx/cccp/cccp.c -+++ b/src/tool/omniidl/cxx/cccp/cccp.c -@@ -8034,7 +8034,7 @@ macroexpand (hp, op) - else - parse_error = macarg (NULL_PTR, 0); - if (parse_error) { -- error_with_line (line_for_error (start_line), parse_error); -+ error_with_line (line_for_error (start_line), "%s", parse_error); - break; - } - i++; diff --git a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch deleted file mode 100644 index 968013a25781..000000000000 --- a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -http://bugs.gentoo.org/326791 - ---- include/omniORB4/sslContext.h -+++ include/omniORB4/sslContext.h -@@ -111,7 +111,11 @@ - virtual ~sslContext(); - - protected: -- virtual SSL_METHOD* set_method(); -+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ virtual const SSL_METHOD* set_method(); -+ #else -+ virtual SSL_METHOD* set_method(); -+ #endif - // Default to return SSLv23_method(). - - virtual void set_supported_versions(); ---- src/lib/omniORB/orbcore/ssl/sslContext.cc -+++ src/lib/omniORB/orbcore/ssl/sslContext.cc -@@ -197,7 +197,11 @@ - } - - ///////////////////////////////////////////////////////////////////////// -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+const SSL_METHOD* -+#else - SSL_METHOD* -+#endif - sslContext::set_method() { - return SSLv23_method(); - } |