rpms/ice/F-11 ice-3.3.1-patch1.txt, NONE, 1.1 patch-rand.txt, NONE, 1.1 slice.patch.txt, NONE, 1.1 ice.spec, 1.30, 1.31
mef
mef at fedoraproject.org
Wed Jul 8 09:25:18 UTC 2009
- Previous message (by thread): rpms/uget/F-11 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 uget.spec, 1.8, 1.9
- Next message (by thread): rpms/ice/F-10 Ice-3.3.1-java-build.patch, NONE, 1.1 Ice-3.3.1-jgoodies.patch, NONE, 1.1 Ice-README.Fedora, NONE, 1.1 ice-3.3.1-patch1.txt, NONE, 1.1 patch-rand.txt, NONE, 1.1 slice.patch.txt, NONE, 1.1 .cvsignore, 1.3, 1.4 ice.spec, 1.20, 1.21 sources, 1.3, 1.4 Ice-3.3-dont-build-demo-test.patch, 1.1, NONE Ice-3.3.0-README.Fedora, 1.1, NONE Ice-3.3.0-compression.patch, 1.1, NONE Ice-3.3.0-fix-slice2cpp-slice2freeze.patch, 1.1, NONE Ice-3.3.0-icegrid-assert.patch, 1.1, NONE Ice-3.3.0-icepatch-non-ascii.patch, 1.1, NONE Ice-3.3.0-java-Timer.patch, 1.1, NONE Ice-3.3.0-java-build.patch, 1.1, NONE Ice-3.3.0-jgoodies.patch, 1.1, NONE Ice-3.3.0-preprocess.patch, 1.1, NONE Ice-3.3.0-python-26.patch, 1.1, NONE Ice-3.3.0-registry-crash.patch, 1.1, NONE Ice-3.3.0-retry-intervals.patch, 1.1, NONE Ice-3.3.0-use-db4.7.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mef
Update of /cvs/pkgs/rpms/ice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28220/F-11
Modified Files:
ice.spec
Added Files:
ice-3.3.1-patch1.txt patch-rand.txt slice.patch.txt
Log Message:
- Update F10 to 3.3.1
- Include all upstream 3.3.1 patches
--- NEW FILE ice-3.3.1-patch1.txt ---
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp
index 4680c57..de13194 100644
--- a/cpp/src/slice2html/Gen.cpp
+++ b/cpp/src/slice2html/Gen.cpp
@@ -562,7 +562,7 @@ Slice::GeneratorBase::printMetaData(const ContainedPtr& p)
}
void
-Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated)
+Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& module, bool deprecated, bool forIndex)
{
ContainerPtr container = ContainerPtr::dynamicCast(p);
if(!container)
@@ -575,7 +575,7 @@ Slice::GeneratorBase::printSummary(const ContainedPtr& p, const ContainerPtr& mo
container = module;
}
- string summary = getComment(p, container, true, module);
+ string summary = getComment(p, container, true, forIndex);
_out << nl << summary;
if(deprecated)
@@ -2042,7 +2042,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2071,7 +2071,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2092,7 +2092,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2115,7 +2115,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2138,7 +2138,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2161,7 +2161,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2184,7 +2184,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2207,7 +2207,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2230,7 +2230,7 @@ Slice::ModuleGenerator::visitContainer(const ContainerPtr& p)
end();
start("dd");
string metadata;
- printSummary(*q, p, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, p, (*q)->findMetaData("deprecate", metadata), true);
end();
}
end();
@@ -2427,7 +2427,7 @@ Slice::ExceptionGenerator::generate(const ExceptionPtr& e)
end();
start("dd");
string metadata;
- printSummary(*q, e, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, e, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
@@ -2557,7 +2557,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
end();
start("dd");
string metadata;
- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
@@ -2578,7 +2578,7 @@ Slice::ClassGenerator::generate(const ClassDefPtr& c)
end();
start("dd");
string metadata;
- printSummary(*q, c, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, c, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
@@ -2739,7 +2739,7 @@ Slice::StructGenerator::generate(const StructPtr& s)
end();
start("dd");
string metadata;
- printSummary(*q, s, (*q)->findMetaData("deprecate", metadata));
+ printSummary(*q, s, (*q)->findMetaData("deprecate", metadata), false);
end();
}
end();
diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h
index 776035b..cacdd58 100644
--- a/cpp/src/slice2html/Gen.h
+++ b/cpp/src/slice2html/Gen.h
@@ -52,7 +52,7 @@ protected:
void printComment(const ContainedPtr&, const ContainerPtr&, const ::std::string&, bool = false);
void printMetaData(const ContainedPtr&);
- void printSummary(const ContainedPtr&, const ContainerPtr&, bool);
+ void printSummary(const ContainedPtr&, const ContainerPtr&, bool, bool);
void printHeaderFooter(const ContainedPtr&);
void printSearch();
--- NEW FILE patch-rand.txt ---
diff --git a/cs/src/Ice/ConnectionFactory.cs b/cs/src/Ice/ConnectionFactory.cs
index 564d718..d6ed702 100644
--- a/cs/src/Ice/ConnectionFactory.cs
+++ b/cs/src/Ice/ConnectionFactory.cs
@@ -136,16 +136,20 @@ namespace IceInternal
//
if(selType == Ice.EndpointSelectionType.Random)
{
- for(int j = 0; j < cons.Count - 2; ++j)
- {
- int r = rand_.Next(cons.Count - j) + j;
- Debug.Assert(r >= j && r < cons.Count);
- if(r != j)
+ lock(rand_)
+ {
+ for(int j = 0; j < cons.Count - 1; ++j)
{
- Connector tmp = cons[j];
- cons[j] = cons[r];
- cons[r] = tmp;
+ int r = rand_.Next(cons.Count - j) + j;
+ Debug.Assert(r >= j && r < cons.Count);
+ if(r != j)
+ {
+ Connector tmp = cons[j];
+ cons[j] = cons[r];
+ cons[r] = tmp;
+ }
}
+
}
}
@@ -1043,15 +1047,18 @@ namespace IceInternal
//
if(_selType == Ice.EndpointSelectionType.Random)
{
- for(int j = 0; j < cons.Count - 2; ++j)
+ lock(rand_)
{
- int r = OutgoingConnectionFactory.rand_.Next(cons.Count - j) + j;
- Debug.Assert(r >= j && r < cons.Count);
- if(r != j)
+ for(int j = 0; j < cons.Count - 1; ++j)
{
- Connector tmp = cons[j];
- cons[j] = cons[r];
- cons[r] = tmp;
+ int r = OutgoingConnectionFactory.rand_.Next(cons.Count - j) + j;
+ Debug.Assert(r >= j && r < cons.Count);
+ if(r != j)
+ {
+ Connector tmp = cons[j];
+ cons[j] = cons[r];
+ cons[r] = tmp;
+ }
}
}
}
diff --git a/cs/src/Ice/Reference.cs b/cs/src/Ice/Reference.cs
index eea221f..88dae69 100644
--- a/cs/src/Ice/Reference.cs
+++ b/cs/src/Ice/Reference.cs
@@ -1377,15 +1377,18 @@ namespace IceInternal
{
case Ice.EndpointSelectionType.Random:
{
- for(int i = 0; i < endpoints.Count - 2; ++i)
+ lock(rand_)
{
- int r = rand_.Next(endpoints.Count - i) + i;
- Debug.Assert(r >= i && r < endpoints.Count);
- if(r != i)
+ for(int i = 0; i < endpoints.Count - 1; ++i)
{
- object tmp = endpoints[i];
- endpoints[i] = endpoints[r];
- endpoints[r] = tmp;
+ int r = rand_.Next(endpoints.Count - i) + i;
+ Debug.Assert(r >= i && r < endpoints.Count);
+ if(r != i)
+ {
+ object tmp = endpoints[i];
+ endpoints[i] = endpoints[r];
+ endpoints[r] = tmp;
+ }
}
}
break;
--- NEW FILE slice.patch.txt ---
diff -r -c -N ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp ./cpp/src/Slice/Preprocessor.cpp
*** ../Ice-3.3.1-old/cpp/src/Slice/Preprocessor.cpp 2009-03-20 15:22:14.000000000 -0230
--- ./cpp/src/Slice/Preprocessor.cpp 2009-05-12 16:18:54.000000000 -0230
***************
*** 46,52 ****
Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
_path(path),
! _fileName(fileName),
_args(args),
_cppHandle(0)
{
--- 46,52 ----
Slice::Preprocessor::Preprocessor(const string& path, const string& fileName, const vector<string>& args) :
_path(path),
! _fileName(fullPath(fileName)),
_args(args),
_cppHandle(0)
{
Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-11/ice.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ice.spec 25 Mar 2009 13:59:00 -0000 1.30
+++ ice.spec 8 Jul 2009 09:24:48 -0000 1.31
@@ -4,7 +4,7 @@
Name: ice
Version: 3.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Ice base runtime and services
Group: System Environment/Libraries
@@ -24,6 +24,12 @@ Patch0: Ice-3.3-dont-build-demo-
Patch1: Ice-3.3.1-java-build.patch
# Remove reference to Windows L&F
Patch2: Ice-3.3.1-jgoodies.patch
+# http://www.zeroc.com/forums/patches/4275-patch-1-ice-3-3-1-slice2html-creates-bad-links.html
+Patch3: ice-3.3.1-patch1.txt
+# http://www.zeroc.com/forums/patches/4340-patch-2-ice-3-3-1-slice-compilers-abort.html
+Patch4: slice.patch.txt
+# http://www.zeroc.com/forums/patches/4423-patch-3-ice-3-3-1-net-only-fix-random-endpoint-selection.html
+Patch5: patch-rand.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -164,6 +170,9 @@ The Ice runtime for PHP applications.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%setup -q -n Ice-rpmbuild-%{version} -T -b 1
%setup -q -n Ice-3.3.0-man-pages -T -b 2
@@ -525,6 +534,13 @@ fi
%config(noreplace) %{_sysconfdir}/php.d/ice.ini
%changelog
+* Wed Jul 8 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-2
+- Include upstream patches:
+ - slice2html creates bad links
+ - slice compilers abort on symlinks and double backslashes
+ - random endpoint selection in .Net
+ See http://www.zeroc.com/forums/patches/ for details
+
* Wed Mar 25 2009 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-1
- Update to new upstream 3.3.1 release
- Includes all previous patches
- Previous message (by thread): rpms/uget/F-11 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 uget.spec, 1.8, 1.9
- Next message (by thread): rpms/ice/F-10 Ice-3.3.1-java-build.patch, NONE, 1.1 Ice-3.3.1-jgoodies.patch, NONE, 1.1 Ice-README.Fedora, NONE, 1.1 ice-3.3.1-patch1.txt, NONE, 1.1 patch-rand.txt, NONE, 1.1 slice.patch.txt, NONE, 1.1 .cvsignore, 1.3, 1.4 ice.spec, 1.20, 1.21 sources, 1.3, 1.4 Ice-3.3-dont-build-demo-test.patch, 1.1, NONE Ice-3.3.0-README.Fedora, 1.1, NONE Ice-3.3.0-compression.patch, 1.1, NONE Ice-3.3.0-fix-slice2cpp-slice2freeze.patch, 1.1, NONE Ice-3.3.0-icegrid-assert.patch, 1.1, NONE Ice-3.3.0-icepatch-non-ascii.patch, 1.1, NONE Ice-3.3.0-java-Timer.patch, 1.1, NONE Ice-3.3.0-java-build.patch, 1.1, NONE Ice-3.3.0-jgoodies.patch, 1.1, NONE Ice-3.3.0-preprocess.patch, 1.1, NONE Ice-3.3.0-python-26.patch, 1.1, NONE Ice-3.3.0-registry-crash.patch, 1.1, NONE Ice-3.3.0-retry-intervals.patch, 1.1, NONE Ice-3.3.0-use-db4.7.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list