View | Details | Raw Unified | Return to bug 222291 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-2 / +1 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=		Ice
4
PORTNAME=		Ice
5
PORTVERSION=		3.6.3
5
PORTVERSION=		3.6.4
6
PORTREVISION=		3
7
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
8
CATEGORIES=		devel
7
CATEGORIES=		devel
9
8
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1483464992
1
TIMESTAMP = 1505206779
2
SHA256 (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc
2
SHA256 (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 4f5cc5e09586eab7de7745bbdc5fbf383c59f8fdc561264d4010bba19afdde2a
3
SIZE (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 5512741
3
SIZE (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 5523841
(-)files/patch-cpp-src-IceGrid-ServerI.cpp (-35 lines)
Lines 1-35 Link Here
1
--- cpp/src/IceGrid/ServerI.cpp.orig	2016-11-15 12:22:54.201742997 +0100
2
+++ cpp/src/IceGrid/ServerI.cpp	2017-09-07 12:48:01.409625996 +0100
3
@@ -341,7 +341,22 @@
4
         {
5
             assert(_p->first.find("config_") == 0);
6
             const string service = _p->first.substr(7);
7
-            facet = "IceBox.Service." + service + ".Properties";
8
+            bool useSharedCommunicator = false;
9
+            for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d)
10
+            {
11
+                if (d->name == "IceBox.UseSharedCommunicator." + service)
12
+                {
13
+                   useSharedCommunicator = (atoi(d->value.c_str()) > 0);
14
+                }
15
+            }
16
+            if (useSharedCommunicator)
17
+            {
18
+                facet = "IceBox.SharedCommunicator.Properties";
19
+            }
20
+            else
21
+            {
22
+                facet = "IceBox.Service." + service + ".Properties";
23
+            }
24
             if(_traceLevels->server > 1)
25
             {
26
                 const string id = _server->getId();
27
@@ -1232,7 +1232,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto
28
             updateRevision(desc->uuid, desc->revision);
29
         }
30
 
31
-        if(!_desc)
32
+        if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc)))
33
         {
34
             _load->addCallback(amdCB);
35
             return 0;
(-)files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp (-84 lines)
Lines 1-84 Link Here
1
--- cpp/src/IceSSL/OpenSSLEngine.cpp.orig	2016-10-05 16:59:08.000000000 +0200
2
+++ cpp/src/IceSSL/OpenSSLEngine.cpp	2016-10-12 01:59:40.150375902 +0200
3
@@ -43,7 +43,7 @@
4
 int instanceCount = 0;
5
 bool initOpenSSL = false;
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
9
 IceUtil::Mutex* locks = 0;
10
 #endif
11
 
12
@@ -62,7 +62,7 @@
13
         // OpenSSL 1.1.0 introduces a new thread API and removes 
14
         // the need to use a custom thread callback.
15
         //
16
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
18
         CRYPTO_set_locking_callback(0);
19
         CRYPTO_set_id_callback(0);
20
 
21
@@ -87,7 +87,7 @@
22
 // OpenSSL 1.1.0 introduces a new thread API and removes 
23
 // the need to use a custom thread callback.
24
 //
25
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
26
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
27
 //
28
 // OpenSSL mutex callback.
29
 //
30
@@ -158,7 +158,7 @@
31
 DH*
32
 IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength)
33
 {
34
-#  if OPENSSL_VERSION_NUMBER >= 0x10100000L
35
+#  if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
36
     SSL_CTX* ctx = SSL_get_SSL_CTX(ssl);
37
 #  else
38
     SSL_CTX* ctx = ssl->ctx;
39
@@ -219,7 +219,7 @@
40
             //
41
             // OpenSSL 1.1.0 remove the need for library initialization and cleanup.
42
             //
43
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
44
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
45
             //
46
             // Create the mutexes and set the callbacks.
47
             //
48
@@ -292,7 +292,9 @@
49
             string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon");
50
             if(!entropyDaemon.empty())
51
             {
52
+#    ifndef OPENSSL_NO_EGD
53
                 if(RAND_egd(entropyDaemon.c_str()) <= 0)
54
+#    endif
55
                 {
56
                     throw PluginInitializationException(__FILE__, __LINE__,
57
                                                         "IceSSL: EGD failure using file " + entropyDaemon);
58
@@ -326,7 +328,7 @@
59
 //
60
 // OpenSSL 1.1.0 remove the need for library initialization and cleanup.
61
 //
62
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
63
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
64
     //
65
     // Clean up OpenSSL resources.
66
     //
67
@@ -399,7 +401,7 @@
68
                                                     "IceSSL: unable to create SSL context:\n" + sslErrors());
69
             }
70
 
71
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
72
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
73
             int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1);
74
             if(securityLevel != -1)
75
             {
76
@@ -954,7 +956,7 @@
77
 SSL_METHOD*
78
 OpenSSLEngine::getMethod(int /*protocols*/)
79
 {
80
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
81
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
82
     SSL_METHOD* meth = const_cast<SSL_METHOD*>(TLS_method());
83
 #else
84
     //
(-)files/patch-cpp-src-IceSSL-Util.cpp (-29 lines)
Lines 1-29 Link Here
1
--- cpp/src/IceSSL/Util.cpp~	2016-10-05 16:59:08.000000000 +0200
2
+++ cpp/src/IceSSL/Util.cpp	2016-10-12 01:55:08.517427902 +0200
3
@@ -110,7 +110,7 @@
4
 {
5
 
6
 #  ifndef OPENSSL_NO_DH
7
-#    if OPENSSL_VERSION_NUMBER < 0x10100000L
8
+#    if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
9
 
10
 // The following arrays are predefined Diffie Hellman group parameters.
11
 // These are known strong primes, distributed with the OpenSSL library
12
@@ -338,7 +338,7 @@
13
 //
14
 // Convert a predefined parameter set into a DH value.
15
 //
16
-#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
17
+#    if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
18
 static DH*
19
 convertDH(const unsigned char* buf, int len)
20
 {
21
@@ -428,7 +428,7 @@
22
     // No match found. Use one of the predefined parameter sets instead.
23
     //
24
     IceUtil::Mutex::Lock sync(*this);
25
-#    if OPENSSL_VERSION_NUMBER >= 0x10100000L
26
+#    if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
27
     if(keyLength >= 4096)
28
     {
29
         if(!_dh4096)
(-)files/patch-cpp-src-IceUtil-Cond.cpp (-11 lines)
Lines 1-11 Link Here
1
--- cpp/src/IceUtil/Cond.cpp.orig	2016-10-12 00:34:17.622732906 +0200
2
+++ cpp/src/IceUtil/Cond.cpp	2016-10-12 00:34:40.133725906 +0200
3
@@ -332,7 +332,7 @@
4
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
5
     }
6
 
7
-#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__)
8
+#if !defined(__hppa) && !defined(__APPLE__)
9
     rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); 
10
     if(rc != 0)
11
     {
(-)files/patch-php-config-Make.rules.php (-16 / +16 lines)
Lines 1-22 Link Here
1
--- php/config/Make.rules.php.orig	2015-06-23 15:30:20.000000000 +0000
1
--- php/config/Make.rules.php.orig	2017-09-13 13:20:00.000000000 +0200
2
+++ php/config/Make.rules.php	2015-06-27 19:48:31.900063596 +0000
2
+++ php/config/Make.rules.php	2017-09-13 13:20:00.000000000 +0200
3
@@ -108,13 +108,8 @@
3
@@ -81,13 +81,8 @@ ifeq ($(findstring /php/test/,$(abspath $(MAKEFILE_LIST))),)
4
         $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH)
5
     endif
4
 
6
 
5
 libdir		= $(top_srcdir)/lib
7
-    ifndef usr_dir_install
8
-        install_phpdir	= $(prefix)/php
9
-        install_libdir  	= $(prefix)/php
10
-    else
11
-        install_phpdir  	= $(prefix)/share/php
12
-        install_libdir  	= $(shell $(PHP_CONFIG) --extension-dir)
13
-    endif
14
+    install_phpdir         = $(prefix)/share/pear
15
+    install_libdir         = $(prefix)/lib/php/$(PHP_EXT_DIR)
16
 endif
6
 
17
 
7
-ifndef usr_dir_install
8
-    install_phpdir	= $(prefix)/php
9
-    install_libdir  	= $(prefix)/php
10
-else
11
-    install_phpdir  	= $(prefix)/share/php
12
-    install_libdir  	= $(shell $(PHP_CONFIG) --extension-dir)
13
-endif
14
+install_phpdir  	= $(prefix)/share/pear
15
+install_libdir  	= $(prefix)/lib/php/$(PHP_EXT_DIR)
16
 
17
 ifdef ice_src_dist
18
 ifdef ice_src_dist
18
     RPATH_DIR	= $(LOADER_PATH)/../../cpp/$(libsubdir)
19
@@ -145,7 +140,8 @@ else
19
@@ -172,7 +167,8 @@
20
 endif
20
 endif
21
 
21
 
22
 ifeq ($(installphplib),)
22
 ifeq ($(installphplib),)
(-)files/patch-python-modules-IcePy-Operation.cpp (-95 / +84 lines)
Lines 1-161 Link Here
1
--- python/modules/IcePy/Operation.cpp.orig	2017-01-29 22:23:51.186130998 +0100
1
--- python/modules/IcePy/Operation.cpp.orig	2017-09-13 13:20:00.000000000 +0200
2
+++ python/modules/IcePy/Operation.cpp	2017-01-29 22:24:55.929130998 +0100
2
+++ python/modules/IcePy/Operation.cpp	2017-09-13 13:20:00.000000000 +0200
3
@@ -1682,11 +1682,11 @@
3
@@ -1036,8 +1036,8 @@ IcePy::ParamInfo::unmarshaled(PyObject* val, PyObject* target, void* closure)
4
 {
5
     assert(PyTuple_Check(target));
6
     Py_ssize_t i = reinterpret_cast<Py_ssize_t>(closure);
7
-    PyTuple_SET_ITEM(target, i, val);
8
-    Py_INCREF(val); // PyTuple_SET_ITEM steals a reference.
9
+    PyTuple_SetItem(target, i, val);
10
+    Py_INCREF(val); // PyTuple_SetItem steals a reference.
11
 }
12
 
13
 //
14
@@ -1682,8 +1682,8 @@ IcePy::TypedInvocation::unmarshalResults(const pair<const Ice::Byte*, const Ice:
4
             }
15
             }
5
             else
16
             else
6
             {
17
             {
7
-                if(PyTuple_SET_ITEM(results.get(), info->pos, Unset) < 0)
18
-                PyTuple_SET_ITEM(results.get(), info->pos, Unset);
8
+                if(PyTuple_SetItem(results.get(), info->pos, Unset) < 0)
9
                 {
10
                     return 0;
11
                 }
12
-                Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference.
19
-                Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference.
20
+                PyTuple_SetItem(results.get(), info->pos, Unset);
13
+                Py_INCREF(Unset); // PyTuple_SetItem steals a reference.
21
+                Py_INCREF(Unset); // PyTuple_SetItem steals a reference.
14
             }
22
             }
15
         }
23
         }
16
 
24
 
17
@@ -2546,7 +2546,7 @@
25
@@ -2543,7 +2543,7 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args, PyObject* /* kwds */)
18
             throwPythonException();
26
             throwPythonException();
19
         }
27
         }
20
 
28
 
21
-        if(PyTuple_SET_ITEM(result.get(), 0, ok ? incTrue() : incFalse()) < 0)
29
-        PyTuple_SET_ITEM(result.get(), 0, ok ? incTrue() : incFalse());
22
+        if(PyTuple_SetItem(result.get(), 0, ok ? incTrue() : incFalse()) < 0)
30
+        PyTuple_SetItem(result.get(), 0, ok ? incTrue() : incFalse());
23
         {
31
 
24
             throwPythonException();
32
 #if PY_VERSION_HEX >= 0x03000000
33
         PyObjectHandle op;
34
@@ -2580,8 +2580,8 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args, PyObject* /* kwds */)
25
         }
35
         }
26
@@ -2586,11 +2586,11 @@
27
         }
28
 #endif
36
 #endif
29
 
37
 
30
-        if(PyTuple_SET_ITEM(result.get(), 1, op.get()) < 0)
38
-        PyTuple_SET_ITEM(result.get(), 1, op.get());
31
+        if(PyTuple_SetItem(result.get(), 1, op.get()) < 0)
32
         {
33
             throwPythonException();
34
         }
35
-        op.release(); // PyTuple_SET_ITEM steals a reference.
39
-        op.release(); // PyTuple_SET_ITEM steals a reference.
40
+        PyTuple_SetItem(result.get(), 1, op.get());
36
+        op.release(); // PyTuple_SetItem steals a reference.
41
+        op.release(); // PyTuple_SetItem steals a reference.
37
 
42
 
38
         return result.release();
43
         return result.release();
39
     }
44
     }
40
@@ -2827,7 +2827,7 @@
45
@@ -2818,7 +2818,7 @@ IcePy::AsyncBlobjectInvocation::end(const Ice::ObjectPrx& proxy, const Ice::Asyn
41
             return 0;
46
             return 0;
42
         }
47
         }
43
 
48
 
44
-        if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
49
-        PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse());
45
+        if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
50
+        PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse());
46
         {
51
 
47
             return 0;
52
 #if PY_VERSION_HEX >= 0x03000000
48
         }
53
         Py_ssize_t sz = results.second - results.first;
49
@@ -2867,11 +2867,11 @@
54
@@ -2855,8 +2855,8 @@ IcePy::AsyncBlobjectInvocation::end(const Ice::ObjectPrx& proxy, const Ice::Asyn
50
         memcpy(buf, results.first, sz);
55
         memcpy(buf, results.first, sz);
51
 #endif
56
 #endif
52
 
57
 
53
-        if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0)
58
-        PyTuple_SET_ITEM(args.get(), 1, op.get());
54
+        if(PyTuple_SetItem(args.get(), 1, op.get()) < 0)
55
         {
56
             return 0;
57
         }
58
-        op.release(); // PyTuple_SET_ITEM steals a reference.
59
-        op.release(); // PyTuple_SET_ITEM steals a reference.
60
+        PyTuple_SetItem(args.get(), 1, op.get());
59
+        op.release(); // PyTuple_SetItem steals a reference.
61
+        op.release(); // PyTuple_SetItem steals a reference.
60
 
62
 
61
         return args.release();
63
         return args.release();
62
     }
64
     }
63
@@ -2910,7 +2910,7 @@
65
@@ -2895,7 +2895,7 @@ IcePy::AsyncBlobjectInvocation::response(bool ok, const pair<const Ice::Byte*, c
64
             return;
66
             return;
65
         }
67
         }
66
 
68
 
67
-        if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
69
-        PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse());
68
+        if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
70
+        PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse());
69
         {
71
 
70
             assert(PyErr_Occurred());
72
 #if PY_VERSION_HEX >= 0x03000000
71
             PyErr_Print();
73
         Py_ssize_t sz = results.second - results.first;
72
@@ -2958,13 +2958,13 @@
74
@@ -2938,8 +2938,8 @@ IcePy::AsyncBlobjectInvocation::response(bool ok, const pair<const Ice::Byte*, c
73
         memcpy(buf, results.first, sz);
75
         memcpy(buf, results.first, sz);
74
 #endif
76
 #endif
75
 
77
 
76
-        if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0)
78
-        PyTuple_SET_ITEM(args.get(), 1, op.get());
77
+        if(PyTuple_SetItem(args.get(), 1, op.get()) < 0)
78
         {
79
             assert(PyErr_Occurred());
80
             PyErr_Print();
81
             return;
82
         }
83
-        op.release(); // PyTuple_SET_ITEM steals a reference.
79
-        op.release(); // PyTuple_SET_ITEM steals a reference.
80
+        PyTuple_SetItem(args.get(), 1, op.get());
84
+        op.release(); // PyTuple_SetItem steals a reference.
81
+        op.release(); // PyTuple_SetItem steals a reference.
85
 
82
 
86
         PyObjectHandle tmp = PyObject_Call(_response, args.get(), 0);
83
         PyObjectHandle tmp = PyObject_Call(_response, args.get(), 0);
87
         if(PyErr_Occurred())
84
         if(PyErr_Occurred())
88
@@ -3126,7 +3126,7 @@
85
@@ -3101,7 +3101,7 @@ IcePy::OldAsyncBlobjectInvocation::response(bool ok, const pair<const Ice::Byte*
89
             return;
86
             return;
90
         }
87
         }
91
 
88
 
92
-        if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
89
-        PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse());
93
+        if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0)
90
+        PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse());
94
         {
91
 
95
             assert(PyErr_Occurred());
92
 #if PY_VERSION_HEX >= 0x03000000
96
             PyErr_Print();
93
         Py_ssize_t sz = results.second - results.first;
97
@@ -3174,13 +3174,13 @@
94
@@ -3144,8 +3144,8 @@ IcePy::OldAsyncBlobjectInvocation::response(bool ok, const pair<const Ice::Byte*
98
         memcpy(buf, results.first, sz);
95
         memcpy(buf, results.first, sz);
99
 #endif
96
 #endif
100
 
97
 
101
-        if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0)
98
-        PyTuple_SET_ITEM(args.get(), 1, op.get());
102
+        if(PyTuple_SetItem(args.get(), 1, op.get()) < 0)
103
         {
104
             assert(PyErr_Occurred());
105
             PyErr_Print();
106
             return;
107
         }
108
-        op.release(); // PyTuple_SET_ITEM steals a reference.
99
-        op.release(); // PyTuple_SET_ITEM steals a reference.
100
+        PyTuple_SetItem(args.get(), 1, op.get());
109
+        op.release(); // PyTuple_SetItem steals a reference.
101
+        op.release(); // PyTuple_SetItem steals a reference.
110
 
102
 
111
         const string methodName = "ice_response";
103
         const string methodName = "ice_response";
112
         if(!PyObject_HasAttrString(_callback, STRCAST(methodName.c_str())))
104
         if(!PyObject_HasAttrString(_callback, STRCAST(methodName.c_str())))
113
@@ -3302,11 +3302,11 @@
105
@@ -3267,8 +3267,8 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con
114
                 }
106
                 }
115
                 else
107
                 else
116
                 {
108
                 {
117
-                    if(PyTuple_SET_ITEM(args.get(), info->pos + offset, Unset) < 0)
109
-                    PyTuple_SET_ITEM(args.get(), info->pos + offset, Unset);
118
+                    if(PyTuple_SetItem(args.get(), info->pos + offset, Unset) < 0)
119
                     {
120
                         throwPythonException();
121
                     }
122
-                    Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference.
110
-                    Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference.
111
+                    PyTuple_SetItem(args.get(), info->pos + offset, Unset);
123
+                    Py_INCREF(Unset); // PyTuple_SetItem steals a reference.
112
+                    Py_INCREF(Unset); // PyTuple_SetItem steals a reference.
124
                 }
113
                 }
125
             }
114
             }
126
 
115
 
127
@@ -3329,11 +3329,11 @@
116
@@ -3291,8 +3291,8 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con
128
     // Create an object to represent Ice::Current. We need to append this to the argument tuple.
117
     // Create an object to represent Ice::Current. We need to append this to the argument tuple.
129
     //
118
     //
130
     PyObjectHandle curr = createCurrent(current);
119
     PyObjectHandle curr = createCurrent(current);
131
-    if(PyTuple_SET_ITEM(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get()) < 0)
120
-    PyTuple_SET_ITEM(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get());
132
+    if(PyTuple_SetItem(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get()) < 0)
133
     {
134
         throwPythonException();
135
     }
136
-    curr.release(); // PyTuple_SET_ITEM steals a reference.
121
-    curr.release(); // PyTuple_SET_ITEM steals a reference.
122
+    PyTuple_SetItem(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get());
137
+    curr.release(); // PyTuple_SetItem steals a reference.
123
+    curr.release(); // PyTuple_SetItem steals a reference.
138
 
124
 
139
     if(_op->amd)
125
     if(_op->amd)
140
     {
126
     {
141
@@ -3347,7 +3347,7 @@
127
@@ -3306,7 +3306,7 @@ IcePy::TypedUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*, con
142
         }
128
         }
143
         obj->upcall = new UpcallPtr(this);
129
         obj->upcall = new UpcallPtr(this);
144
         obj->encoding = current.encoding;
130
         obj->encoding = current.encoding;
145
-        if(PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SET_ITEM steals a reference.
131
-        PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj); // PyTuple_SET_ITEM steals a reference.
146
+        if(PyTuple_SetItem(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SetItem steals a reference.
132
+        PyTuple_SetItem(args.get(), 0, (PyObject*)obj); // PyTuple_SetItem steals a reference.
147
         {
148
             Py_DECREF(obj);
149
             throwPythonException();
150
@@ -3698,23 +3698,23 @@
151
     }
133
     }
134
 
135
     //
136
@@ -3398,7 +3398,7 @@ IcePy::TypedUpcall::response(PyObject* args, const Ice::EncodingVersion& encodin
137
                 {
138
                     throw AbortMarshaling();
139
                 }
140
-                PyTuple_SET_ITEM(t.get(), 0, args);
141
+                PyTuple_SetItem(t.get(), 0, args);
142
             }
143
             Py_INCREF(args);
144
 
145
@@ -3653,17 +3653,17 @@ IcePy::BlobjectUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*,
146
     }
152
 #endif
147
 #endif
153
 
148
 
154
-    if(PyTuple_SET_ITEM(args.get(), start, ip.get()) < 0)
149
-    PyTuple_SET_ITEM(args.get(), start, ip.get());
155
+    if(PyTuple_SetItem(args.get(), start, ip.get()) < 0)
150
+    PyTuple_SetItem(args.get(), start, ip.get());
156
     {
157
         throwPythonException();
158
     }
159
     ++start;
151
     ++start;
160
-    ip.release(); // PyTuple_SET_ITEM steals a reference.
152
-    ip.release(); // PyTuple_SET_ITEM steals a reference.
161
+    ip.release(); // PyTuple_SetItem steals a reference.
153
+    ip.release(); // PyTuple_SetItem steals a reference.
Lines 165-186 Link Here
165
     // this to the argument tuple.
157
     // this to the argument tuple.
166
     //
158
     //
167
     PyObjectHandle curr = createCurrent(current);
159
     PyObjectHandle curr = createCurrent(current);
168
-    if(PyTuple_SET_ITEM(args.get(), start, curr.get()) < 0)
160
-    PyTuple_SET_ITEM(args.get(), start, curr.get());
169
+    if(PyTuple_SetItem(args.get(), start, curr.get()) < 0)
170
     {
171
         throwPythonException();
172
     }
173
-    curr.release(); // PyTuple_SET_ITEM steals a reference.
161
-    curr.release(); // PyTuple_SET_ITEM steals a reference.
162
+    PyTuple_SetItem(args.get(), start, curr.get());
174
+    curr.release(); // PyTuple_SetItem steals a reference.
163
+    curr.release(); // PyTuple_SetItem steals a reference.
175
 
164
 
176
     string dispatchName = "ice_invoke";
165
     string dispatchName = "ice_invoke";
177
     if(_amd)
166
     if(_amd)
178
@@ -3730,7 +3730,7 @@
167
@@ -3679,7 +3679,7 @@ IcePy::BlobjectUpcall::dispatch(PyObject* servant, const pair<const Ice::Byte*,
179
         }
168
         }
180
         obj->upcall = new UpcallPtr(this);
169
         obj->upcall = new UpcallPtr(this);
181
         obj->encoding = current.encoding;
170
         obj->encoding = current.encoding;
182
-        if(PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SET_ITEM steals a reference.
171
-        PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj); // PyTuple_SET_ITEM steals a reference.
183
+        if(PyTuple_SetItem(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SetItem steals a reference.
172
+        PyTuple_SetItem(args.get(), 0, (PyObject*)obj); // PyTuple_SetItem steals a reference.
184
         {
173
     }
185
             Py_DECREF(obj);
174
 
186
             throwPythonException();
175
     //
(-)pkg-plist (-15 / +15 lines)
Lines 241-289 Link Here
241
include/Slice/RubyUtil.h
241
include/Slice/RubyUtil.h
242
include/Slice/Util.h
242
include/Slice/Util.h
243
lib/libFreeze.so
243
lib/libFreeze.so
244
lib/libFreeze.so.3.6.3
244
lib/libFreeze.so.3.6.4
245
lib/libFreeze.so.36
245
lib/libFreeze.so.36
246
lib/libGlacier2.so
246
lib/libGlacier2.so
247
lib/libGlacier2.so.3.6.3
247
lib/libGlacier2.so.3.6.4
248
lib/libGlacier2.so.36
248
lib/libGlacier2.so.36
249
lib/libGlacier2CryptPermissionsVerifier.so
249
lib/libGlacier2CryptPermissionsVerifier.so
250
lib/libGlacier2CryptPermissionsVerifier.so.3.6.3
250
lib/libGlacier2CryptPermissionsVerifier.so.3.6.4
251
lib/libGlacier2CryptPermissionsVerifier.so.36
251
lib/libGlacier2CryptPermissionsVerifier.so.36
252
lib/libIce.so
252
lib/libIce.so
253
lib/libIce.so.3.6.3
253
lib/libIce.so.3.6.4
254
lib/libIce.so.36
254
lib/libIce.so.36
255
lib/libIceBox.so
255
lib/libIceBox.so
256
lib/libIceBox.so.3.6.3
256
lib/libIceBox.so.3.6.4
257
lib/libIceBox.so.36
257
lib/libIceBox.so.36
258
lib/libIceDiscovery.so
258
lib/libIceDiscovery.so
259
lib/libIceDiscovery.so.3.6.3
259
lib/libIceDiscovery.so.3.6.4
260
lib/libIceDiscovery.so.36
260
lib/libIceDiscovery.so.36
261
lib/libIceGrid.so
261
lib/libIceGrid.so
262
lib/libIceGrid.so.3.6.3
262
lib/libIceGrid.so.3.6.4
263
lib/libIceGrid.so.36
263
lib/libIceGrid.so.36
264
lib/libIceLocatorDiscovery.so
264
lib/libIceLocatorDiscovery.so
265
lib/libIceLocatorDiscovery.so.3.6.3
265
lib/libIceLocatorDiscovery.so.3.6.4
266
lib/libIceLocatorDiscovery.so.36
266
lib/libIceLocatorDiscovery.so.36
267
lib/libIcePatch2.so
267
lib/libIcePatch2.so
268
lib/libIcePatch2.so.3.6.3
268
lib/libIcePatch2.so.3.6.4
269
lib/libIcePatch2.so.36
269
lib/libIcePatch2.so.36
270
lib/libIceSSL.so
270
lib/libIceSSL.so
271
lib/libIceSSL.so.3.6.3
271
lib/libIceSSL.so.3.6.4
272
lib/libIceSSL.so.36
272
lib/libIceSSL.so.36
273
lib/libIceStorm.so
273
lib/libIceStorm.so
274
lib/libIceStorm.so.3.6.3
274
lib/libIceStorm.so.3.6.4
275
lib/libIceStorm.so.36
275
lib/libIceStorm.so.36
276
lib/libIceStormService.so
276
lib/libIceStormService.so
277
lib/libIceStormService.so.3.6.3
277
lib/libIceStormService.so.3.6.4
278
lib/libIceStormService.so.36
278
lib/libIceStormService.so.36
279
lib/libIceUtil.so
279
lib/libIceUtil.so
280
lib/libIceUtil.so.3.6.3
280
lib/libIceUtil.so.3.6.4
281
lib/libIceUtil.so.36
281
lib/libIceUtil.so.36
282
lib/libIceXML.so
282
lib/libIceXML.so
283
lib/libIceXML.so.3.6.3
283
lib/libIceXML.so.3.6.4
284
lib/libIceXML.so.36
284
lib/libIceXML.so.36
285
lib/libSlice.so
285
lib/libSlice.so
286
lib/libSlice.so.3.6.3
286
lib/libSlice.so.3.6.4
287
lib/libSlice.so.36
287
lib/libSlice.so.36
288
man/man1/dumpdb.1.gz
288
man/man1/dumpdb.1.gz
289
man/man1/glacier2router.1.gz
289
man/man1/glacier2router.1.gz

Return to bug 222291