From b80feb6cd572afd92e2911ea445f2add65a1bf1dca61c40e6dbc98f0a6cc725b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 15 Jan 2008 05:03:43 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mono-core?expand=0&rev=14 --- mono-1.2.5.tar.bz2 | 3 - mono-1.2.6.tar.bz2 | 3 + mono-boo_ia64_fix.patch | 22 - mono-core.changes | 22 + mono-core.spec | 138 +++--- mono-mcs_r85721_biginteger_security_fix.patch | 399 ----------------- mono-security_includes_warnings.patch | 10 + mono_1.2.5_p4.patch.bz2 | 3 - mono_1.2.5_p5_p6_final.patch | 402 ------------------ 9 files changed, 117 insertions(+), 885 deletions(-) delete mode 100644 mono-1.2.5.tar.bz2 create mode 100644 mono-1.2.6.tar.bz2 delete mode 100644 mono-boo_ia64_fix.patch delete mode 100644 mono-mcs_r85721_biginteger_security_fix.patch create mode 100644 mono-security_includes_warnings.patch delete mode 100644 mono_1.2.5_p4.patch.bz2 delete mode 100644 mono_1.2.5_p5_p6_final.patch diff --git a/mono-1.2.5.tar.bz2 b/mono-1.2.5.tar.bz2 deleted file mode 100644 index 9a854ee..0000000 --- a/mono-1.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec29da2a97cb0e171928141e9a53d6b5c9e3cd6cd7b0d26f4353f8bde4d0d57a -size 17953355 diff --git a/mono-1.2.6.tar.bz2 b/mono-1.2.6.tar.bz2 new file mode 100644 index 0000000..a8867c0 --- /dev/null +++ b/mono-1.2.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24cc4f396cac3053c7ba3fe68bc1b80359d75dc4f54a85f39a73cabc3d3f560f +size 18163130 diff --git a/mono-boo_ia64_fix.patch b/mono-boo_ia64_fix.patch deleted file mode 100644 index 903412d..0000000 --- a/mono-boo_ia64_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: mono/io-layer/atomic.h -=================================================================== ---- mono/io-layer/atomic.h (revision 87799) -+++ mono/io-layer/atomic.h (revision 87800) -@@ -710,13 +710,16 @@ - gint32 exch, gint32 comp) - { - gint32 old; -+ guint64 real_comp; - - #ifdef __INTEL_COMPILER - old = _InterlockedCompareExchange (dest, exch, comp); - #else -+ /* cmpxchg4 zero extends the value read from memory */ -+ real_comp = (guint64)(guint32)comp; - asm volatile ("mov ar.ccv = %2 ;;\n\t" - "cmpxchg4.acq %0 = [%1], %3, ar.ccv\n\t" -- : "=r" (old) : "r" (dest), "r" (comp), "r" (exch)); -+ : "=r" (old) : "r" (dest), "r" (real_comp), "r" (exch)); - #endif - - return(old); diff --git a/mono-core.changes b/mono-core.changes index 838892f..b5b3024 100644 --- a/mono-core.changes +++ b/mono-core.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Jan 14 13:23:23 MST 2007 - wberrier@suse.de + +- Update to 1.2.6 + -Support for the ASP.NET AJAX APIs and controls + -Support for FastCGI deployments + -Windows.Forms WebControl for Windows and Linux using Mozilla + -Reduced memory usage in the runtime for 2.0 apps + -Updated verifier + -Implementation of CoreCLR security + -More C# compiler 3.0 completion + -Mono 1.2.6 can now be used as an SDK for creating Silverlight + 1.1 applications on all platforms. + -Support for the PE32+ assembly file format + -Managed allocations support + -SslStream support + -System.Net.Mail improvements + -Fixed SSL/TLS thread-synchronization + (for LDAPS over multiple threads) + -Novell.Directory.Ldap synchronized with the Novell's CSHARP + LDAP SDK (version 2.1.8) + ------------------------------------------------------------------- Tue Oct 23 21:37:23 CEST 2007 - wberrier@suse.de diff --git a/mono-core.spec b/mono-core.spec index af9c88c..7e2232c 100644 --- a/mono-core.spec +++ b/mono-core.spec @@ -1,7 +1,7 @@ # -# spec file for package mono-core (Version 1.2.5) +# spec file for package mono-core (Version 1.2.6) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,14 +15,11 @@ License: LGPL v2.1 or later Group: Development/Languages/Mono Summary: A .NET Runtime Environment Url: http://go-mono.org/ -Version: 1.2.5 -Release: 26 +Version: 1.2.6 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 -Patch0: mono_1.2.5_p4.patch.bz2 -Patch1: mono_1.2.5_p5_p6_final.patch -Patch2: mono-mcs_r85721_biginteger_security_fix.patch -Patch3: mono-boo_ia64_fix.patch +Patch0: mono-security_includes_warnings.patch ExclusiveArch: %ix86 x86_64 ppc hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -39,6 +36,11 @@ Provides: mono-cairo Provides: mono-xml-relaxng Provides: mono-posix Provides: mono-ziplib +# This version of mono has issues with the following versions of apps: +# (not because of regressions, but because bugfixes in mono uncover bugs in the apps) +Conflicts: helix-banshee <= 0.13.1 +Conflicts: banshee <= 0.13.1 +Conflicts: f-spot <= 0.3.5 # Require when in the buildserivce %if 0%{?opensuse_bs} Requires: libgdiplus @@ -53,11 +55,9 @@ BuildRequires: glib2-devel # For some reason these weren't required in 10.2 and before... ? %if %{suse_version} > 1020 BuildRequires: bison -# Add valgrind support for 10.3 and above on supported platforms -%ifarch i586 x86_64 ppc ppc64 +# Add valgrind support for 10.3 and above BuildRequires: valgrind %endif -%endif %if %{sles_version} == 9 %define configure_options export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/%_lib/pkgconfig BuildRequires: pkgconfig @@ -67,18 +67,16 @@ BuildRequires: pkgconfig %ifarch s390 s390x PreReq: grep %endif +# TODO: # This won't work until the rpm package passes .config files to mono-find-requires #%define __find_provides env MONO_PREFIX=%{buildroot}/usr /usr/lib/rpm/find-provides #%define __find_requires env MONO_PREFIX=%{buildroot}/usr /usr/lib/rpm/find-requires -# auto dep/req generation for older distros (it will take a while for the .config scanning to get upstream) -%if 0%{?suse_version} <= 1040 || 0%{?fedora_version} <= 7 %if 0%{?fedora_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 %endif %define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}/usr %{buildroot}/usr/bin/mono-find-provides ; } | sort | uniq' %define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | prefix=%{buildroot}/usr %{buildroot}/usr/bin/mono-find-requires ; } | sort | uniq' -%endif %description The Mono Project is an open development initiative that is working to @@ -95,7 +93,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files %defattr(-, root, root) %doc AUTHORS COPYING.LIB ChangeLog NEWS README @@ -116,6 +113,7 @@ Authors: %_bindir/chktrust %_bindir/gacutil %_bindir/gmcs +%_bindir/mono-test-install %_bindir/mcs %_bindir/smcs %_bindir/mozroots @@ -154,23 +152,29 @@ Authors: %_prefix/lib/mono/gac/System.Xml %_prefix/lib/mono/1.0/System.Xml.dll %_prefix/lib/mono/2.0/System.Xml.dll +%_prefix/lib/mono/gac/System.Xml.Core +%_prefix/lib/mono/2.1/System.Xml.Core.dll %_prefix/lib/mono/gac/System %_prefix/lib/mono/1.0/System.dll %_prefix/lib/mono/2.0/System.dll +%_prefix/lib/mono/2.1/System.dll %_prefix/lib/mono/gac/System.Configuration %_prefix/lib/mono/2.0/System.Configuration.dll %_prefix/lib/mono/1.0/mscorlib.dll* %_prefix/lib/mono/2.0/mscorlib.dll* -%dir /etc/mono -%dir /etc/mono/1.0 -%dir /etc/mono/2.0 +%_prefix/lib/mono/2.1/mscorlib.dll* +%_prefix/lib/mono/2.1/smcs.exe* +%dir %_sysconfdir/mono +%dir %_sysconfdir/mono/1.0 +%dir %_sysconfdir/mono/2.0 %dir %_prefix/lib/mono %dir %_prefix/lib/mono/1.0 %dir %_prefix/lib/mono/2.0 +%dir %_prefix/lib/mono/2.1 %dir %_prefix/lib/mono/gac -%config /etc/mono/config -%config /etc/mono/1.0/machine.config -%config /etc/mono/2.0/machine.config +%config %_sysconfdir/mono/config +%config %_sysconfdir/mono/1.0/machine.config +%config %_sysconfdir/mono/2.0/machine.config %_prefix/lib/mono/gac/Mono.C5 %_prefix/lib/mono/2.0/Mono.C5.dll # ikvm helper @@ -204,6 +208,7 @@ Authors: %_prefix/lib/mono/2.0/OpenSystem.C.dll %_prefix/lib/mono/gac/System.Core %_prefix/lib/mono/2.0/System.Core.dll +%_prefix/lib/mono/2.1/System.Core.dll %post /sbin/ldconfig @@ -235,7 +240,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-jscript %defattr(-, root, root) %_bindir/mjs @@ -266,7 +270,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-locale-extras %defattr(-, root, root) %_prefix/lib/mono/gac/I18N.MidEast @@ -310,7 +313,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-data %defattr(-, root, root) %_prefix/lib/mono/1.0/sqlsharp.exe* @@ -364,7 +366,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-winforms %defattr(-, root, root) %_prefix/lib/mono/gac/System.Windows.Forms @@ -379,6 +380,10 @@ Authors: %_prefix/lib/mono/gac/System.Drawing.Design %_prefix/lib/mono/1.0/System.Drawing.Design.dll %_prefix/lib/mono/2.0/System.Drawing.Design.dll +# TODO: Post 1.2.5: +%_prefix/lib/mono/1.0/Mono.Mozilla.dll +%_prefix/lib/mono/2.0/Mono.Mozilla.dll +%_prefix/lib/mono/gac/Mono.Mozilla %package -n ibm-data-db2 Summary: Database connectivity for DB2 @@ -402,7 +407,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n ibm-data-db2 %defattr(-, root, root) %_prefix/lib/mono/gac/IBM.Data.DB2 @@ -432,7 +436,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-extras %defattr(-, root, root) %_mandir/man1/mono-service.1.gz @@ -483,7 +486,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-data-sqlite %defattr(-, root, root) %_prefix/lib/mono/gac/Mono.Data.SqliteClient @@ -516,7 +518,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-data-sybase %defattr(-, root, root) %_prefix/lib/mono/gac/Mono.Data.SybaseClient @@ -551,7 +552,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-web %defattr(-, root, root) %_prefix/lib/mono/gac/Mono.Http @@ -569,14 +569,20 @@ Authors: %_prefix/lib/mono/gac/System.Web.Services %_prefix/lib/mono/1.0/System.Web.Services.dll %_prefix/lib/mono/2.0/System.Web.Services.dll +%_prefix/lib/mono/gac/System.Web.Extensions +%_prefix/lib/mono/2.0/System.Web.Extensions.dll +%_prefix/lib/mono/gac/System.Web.Extensions.Design +%_prefix/lib/mono/2.0/System.Web.Extensions.Design.dll # exes %_prefix/lib/mono/1.0/disco.exe* %_prefix/lib/mono/1.0/soapsuds.exe* %_prefix/lib/mono/1.0/wsdl.exe* %_prefix/lib/mono/2.0/wsdl.exe* %_prefix/lib/mono/1.0/xsd.exe* +%_prefix/lib/mono/2.0/mconfig.exe* # shell wrappers %_bindir/disco +%_bindir/mconfig %_bindir/soapsuds %_bindir/wsdl %_bindir/wsdl2 @@ -586,10 +592,13 @@ Authors: %_mandir/man1/soapsuds.1.gz %_mandir/man1/wsdl.1.gz %_mandir/man1/xsd.1.gz -%config /etc/mono/browscap.ini -%config /etc/mono/1.0/DefaultWsdlHelpGenerator.aspx -%config /etc/mono/2.0/DefaultWsdlHelpGenerator.aspx -%config /etc/mono/2.0/web.config +%_mandir/man1/mconfig.1.gz +%config %_sysconfdir/mono/browscap.ini +%dir %_sysconfdir/mono/mconfig +%config %_sysconfdir/mono/mconfig/config.xml +%config %_sysconfdir/mono/1.0/DefaultWsdlHelpGenerator.aspx +%config %_sysconfdir/mono/2.0/DefaultWsdlHelpGenerator.aspx +%config %_sysconfdir/mono/2.0/web.config %package -n mono-data-oracle Summary: Database connectivity for Mono @@ -614,7 +623,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-data-oracle %defattr(-, root, root) %_prefix/lib/mono/gac/System.Data.OracleClient @@ -644,7 +652,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-data-postgresql %defattr(-, root, root) %_prefix/lib/mono/gac/Npgsql @@ -674,7 +681,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n bytefx-data-mysql %defattr(-, root, root) %_prefix/lib/mono/gac/ByteFX.Data @@ -705,12 +711,10 @@ Database connectivity for Mono. - %files -n mono-data-firebird %defattr(-, root, root) %_prefix/lib/mono/gac/FirebirdSql.Data.Firebird %_prefix/lib/mono/1.0/FirebirdSql.Data.Firebird.dll -#%_prefix/lib/mono/2.0/FirebirdSql.Data.Firebird.dll %description -n mono-nunit NUnit is a unit-testing framework for all .Net languages. Initially @@ -729,21 +733,20 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-nunit %defattr(-, root, root) %_prefix/bin/nunit-console %_prefix/bin/nunit-console2 %_prefix/lib/mono/1.0/nunit-console.exe* %_prefix/lib/mono/2.0/nunit-console.exe* -%_prefix/lib/mono/1.0/nunit.core.dll -%_prefix/lib/mono/1.0/nunit.framework.dll -%_prefix/lib/mono/1.0/nunit.util.dll -%_prefix/lib/mono/1.0/nunit.mocks.dll -%_prefix/lib/mono/gac/nunit.core -%_prefix/lib/mono/gac/nunit.framework %_prefix/lib/mono/gac/nunit.util +%_prefix/lib/mono/1.0/nunit.util.dll +%_prefix/lib/mono/gac/nunit.core +%_prefix/lib/mono/1.0/nunit.core.dll +%_prefix/lib/mono/gac/nunit.framework +%_prefix/lib/mono/1.0/nunit.framework.dll %_prefix/lib/mono/gac/nunit.mocks +%_prefix/lib/mono/1.0/nunit.mocks.dll %_libdir/pkgconfig/mono-nunit.pc %package -n mono-devel @@ -817,6 +820,7 @@ Authors: %_prefix/lib/mono/2.0/Microsoft.Common.tasks %_prefix/lib/mono/2.0/Microsoft.Common.targets %_prefix/lib/mono/2.0/Microsoft.CSharp.targets +%_prefix/lib/mono/2.0/Microsoft.VisualBasic.targets %_prefix/lib/mono/2.0/MSBuild %_prefix/lib/mono/2.0/xbuild.rsp # man pages @@ -890,6 +894,7 @@ Authors: %_prefix/lib/mono/gac/Microsoft.Build.Engine %_prefix/lib/mono/2.0/Microsoft.Build.Engine.dll %_prefix/lib/mono/gac/Mono.Cecil +%_prefix/lib/mono/gac/Mono.Cecil.Mdb %_bindir/monograph %_prefix/include/mono-1.0 %_libdir/libmono-profiler-cov.* @@ -897,6 +902,7 @@ Authors: %_libdir/pkgconfig/mono.pc %_libdir/pkgconfig/dotnet.pc %_libdir/pkgconfig/mono-cairo.pc +%_libdir/pkgconfig/cecil.pc %_mandir/man1/monoburg.* %_prefix/share/mono-1.0/mono/cil/cil-opcodes.xml # dirs @@ -913,12 +919,16 @@ Requires: bytefx-data-mysql = %version-%release Requires: ibm-data-db2 = %version-%release Requires: mono-core = %version-%release Requires: mono-data = %version-%release +Requires: mono-data-firebird = %version-%release Requires: mono-data-oracle = %version-%release Requires: mono-data-postgresql = %version-%release Requires: mono-data-sqlite = %version-%release Requires: mono-data-sybase = %version-%release +Requires: mono-devel = %version-%release Requires: mono-extras = %version-%release +Requires: mono-jscript = %version-%release Requires: mono-locale-extras = %version-%release +Requires: mono-nunit = %version-%release Requires: mono-web = %version-%release Requires: mono-winforms = %version-%release @@ -937,7 +947,6 @@ Authors: Paolo Molaro Dietmar Maurer - %files -n mono-complete %defattr(-, root, root) # Directories @@ -947,10 +956,7 @@ Authors: %prep %setup -q -n mono-%{version} -%patch0 -%patch1 -p1 -%patch2 -%patch3 +%patch0 -p1 %build # These are only needed if there are patches to the runtime @@ -963,7 +969,8 @@ export CFLAGS=" $RPM_OPT_FLAGS -DKDE_ASSEMBLIES='\"/opt/kde3/%{_lib}\"' -fno-str %configure \ --with-jit=yes \ --with-ikvm=yes \ - --with-sigaltstack=no + --with-sigaltstack=no \ + --with-moonlight=yes make %install @@ -1029,14 +1036,14 @@ rm -f $RPM_BUILD_ROOT/usr/%_lib/libMonoSupportW.so # 1.1.17 updates: # This file moved to mono-basic rm -f $RPM_BUILD_ROOT/usr/bin/mbas -# From 1.2.3.1 update -cd $RPM_BUILD_ROOT -rm -f ./usr/lib/mono/2.0/Microsoft.VisualBasic.targets # 1.2.4 changes -rm -f ./usr/lib/mono/1.0/culevel.exe* +rm -f $RPM_BUILD_ROOT/usr/lib/mono/1.0/culevel.exe* +# Post 1.2.5 +rm -f $RPM_BUILD_ROOT/usr/lib/mono/1.0/transform.exe %clean rm -rf ${RPM_BUILD_ROOT} + %changelog * Tue Oct 23 2007 - wberrier@suse.de - mono-boo_ia64_fix.patch: fix boo build on ia64. @@ -1183,6 +1190,25 @@ rm -rf ${RPM_BUILD_ROOT} - Move libgdiplus requirement from mono-winforms to mono-core since System.Drawing (in mono-core) is useless without it (Won't affect mono-winforms, since it depends on mono-core) +* Sun Jan 14 2007 - wberrier@suse.de +- Update to 1.2.6 + -Support for the ASP.NET AJAX APIs and controls + -Support for FastCGI deployments + -Windows.Forms WebControl for Windows and Linux using Mozilla + -Reduced memory usage in the runtime for 2.0 apps + -Updated verifier + -Implementation of CoreCLR security + -More C# compiler 3.0 completion + -Mono 1.2.6 can now be used as an SDK for creating Silverlight + 1.1 applications on all platforms. + -Support for the PE32+ assembly file format + -Managed allocations support + -SslStream support + -System.Net.Mail improvements + -Fixed SSL/TLS thread-synchronization + (for LDAPS over multiple threads) + -Novell.Directory.Ldap synchronized with the Novell's CSHARP + LDAP SDK (version 2.1.8) * Tue Jan 09 2007 - wberrier@suse.de - Move mono-find-provides/requires to mono-devel since they depend on monodis, which is in mono-devel diff --git a/mono-mcs_r85721_biginteger_security_fix.patch b/mono-mcs_r85721_biginteger_security_fix.patch deleted file mode 100644 index 47a461b..0000000 --- a/mono-mcs_r85721_biginteger_security_fix.patch +++ /dev/null @@ -1,399 +0,0 @@ -Index: mcs/class/corlib/Mono.Math.Prime.Generator/PrimeGeneratorBase.cs -=================================================================== ---- mcs/class/corlib/Mono.Math.Prime.Generator/PrimeGeneratorBase.cs (revision 85720) -+++ mcs/class/corlib/Mono.Math.Prime.Generator/PrimeGeneratorBase.cs (revision 85721) -@@ -8,8 +8,6 @@ - // - - // --// Copyright (C) 2004 Novell, Inc (http://www.novell.com) --// - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the - // "Software"), to deal in the Software without restriction, including -Index: mcs/class/corlib/Mono.Math.Prime.Generator/ChangeLog -=================================================================== ---- mcs/class/corlib/Mono.Math.Prime.Generator/ChangeLog (revision 85720) -+++ mcs/class/corlib/Mono.Math.Prime.Generator/ChangeLog (revision 85721) -@@ -1,3 +1,8 @@ -+2007-09-12 Sebastien Pouliot -+ -+ * NextPrimeFinder.cs, PrimeGeneratorBase.cs: Updated to match -+ Mono.Security sources. -+ - 2004-09-16 Sebastien Pouliot - - * SequentialSearchPrimeGeneratorBase.cs: Fixed warning (l4) for unused -Index: mcs/class/corlib/Mono.Math.Prime.Generator/NextPrimeFinder.cs -=================================================================== ---- mcs/class/corlib/Mono.Math.Prime.Generator/NextPrimeFinder.cs (revision 85720) -+++ mcs/class/corlib/Mono.Math.Prime.Generator/NextPrimeFinder.cs (revision 85721) -@@ -8,8 +8,6 @@ - // - - // --// Copyright (C) 2004 Novell, Inc (http://www.novell.com) --// - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the - // "Software"), to deal in the Software without restriction, including -Index: mcs/class/corlib/Mono.Math.Prime/ConfidenceFactor.cs -=================================================================== ---- mcs/class/corlib/Mono.Math.Prime/ConfidenceFactor.cs (revision 85720) -+++ mcs/class/corlib/Mono.Math.Prime/ConfidenceFactor.cs (revision 85721) -@@ -8,8 +8,6 @@ - // - - // --// Copyright (C) 2004 Novell, Inc (http://www.novell.com) --// - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the - // "Software"), to deal in the Software without restriction, including -Index: mcs/class/corlib/Mono.Math.Prime/PrimalityTests.cs -=================================================================== ---- mcs/class/corlib/Mono.Math.Prime/PrimalityTests.cs (revision 85720) -+++ mcs/class/corlib/Mono.Math.Prime/PrimalityTests.cs (revision 85721) -@@ -8,8 +8,6 @@ - // - - // --// Copyright (C) 2004 Novell, Inc (http://www.novell.com) --// - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the - // "Software"), to deal in the Software without restriction, including -@@ -94,10 +92,19 @@ - } - } - -+ public static bool Test (BigInteger n, ConfidenceFactor confidence) -+ { -+ // Rabin-Miller fails with smaller primes (at least with our BigInteger code) -+ if (n.BitCount () < 33) -+ return SmallPrimeSppTest (n, confidence); -+ else -+ return RabinMillerTest (n, confidence); -+ } -+ - /// - /// Probabilistic prime test based on Rabin-Miller's test - /// -- /// -+ /// - /// - /// The number to test. - /// -@@ -116,67 +123,51 @@ - /// False if "this" is definitely NOT prime. - /// - /// -- public static bool RabinMillerTest (BigInteger bi, ConfidenceFactor confidence) -+ public static bool RabinMillerTest (BigInteger n, ConfidenceFactor confidence) - { -- int Rounds = GetSPPRounds (bi, confidence); -+ int bits = n.BitCount (); -+ int t = GetSPPRounds (bits, confidence); - -- // calculate values of s and t -- BigInteger p_sub1 = bi - 1; -- int s = p_sub1.LowestSetBit (); -+ // n - 1 == 2^s * r, r is odd -+ BigInteger n_minus_1 = n - 1; -+ int s = n_minus_1.LowestSetBit (); -+ BigInteger r = n_minus_1 >> s; - -- BigInteger t = p_sub1 >> s; -- -- int bits = bi.BitCount (); -- BigInteger a = null; -- BigInteger.ModulusRing mr = new BigInteger.ModulusRing (bi); -+ BigInteger.ModulusRing mr = new BigInteger.ModulusRing (n); - - // Applying optimization from HAC section 4.50 (base == 2) - // not a really random base but an interesting (and speedy) one -- BigInteger b = mr.Pow (2, t); -- if (b != 1) { -- bool result = false; -- for (int j=0; j < s; j++) { -- if (b == p_sub1) { // a^((2^j)*t) mod p = p-1 for some 0 <= j <= s-1 -- result = true; -- break; -- } -+ BigInteger y = null; -+ // FIXME - optimization disable for small primes due to bug #81857 -+ if (n.BitCount () > 100) -+ y = mr.Pow (2, r); - -- b = (b * b) % bi; -- } -- if (!result) -- return false; -- } -- - // still here ? start at round 1 (round 0 was a == 2) -- for (int round = 1; round < Rounds; round++) { -- while (true) { // generate a < n -- a = BigInteger.GenerateRandom (bits); -+ for (int round = 0; round < t; round++) { - -- // make sure "a" is not 0 (and not 2 as we have already tested that) -- if (a > 2 && a < bi) -- break; -- } -+ if ((round > 0) || (y == null)) { -+ BigInteger a = null; - -- if (a.GCD (bi) != 1) -- return false; -+ // check for 2 <= a <= n - 2 -+ // ...but we already did a == 2 previously as an optimization -+ do { -+ a = BigInteger.GenerateRandom (bits); -+ } while ((a <= 2) && (a >= n_minus_1)); - -- b = mr.Pow (a, t); -+ y = mr.Pow (a, r); -+ } - -- if (b == 1) -- continue; // a^t mod p = 1 -+ if (y == 1) -+ continue; - -- bool result = false; -- for (int j = 0; j < s; j++) { -+ for (int j = 0; ((j < s) && (y != n_minus_1)); j++) { - -- if (b == p_sub1) { // a^((2^j)*t) mod p = p-1 for some 0 <= j <= s-1 -- result = true; -- break; -- } -- -- b = (b * b) % bi; -+ y = mr.Pow (y, 2); -+ if (y == 1) -+ return false; - } - -- if (!result) -+ if (y != n_minus_1) - return false; - } - return true; -Index: mcs/class/corlib/Mono.Math.Prime/ChangeLog -=================================================================== ---- mcs/class/corlib/Mono.Math.Prime/ChangeLog (revision 85720) -+++ mcs/class/corlib/Mono.Math.Prime/ChangeLog (revision 85721) -@@ -1,3 +1,8 @@ -+2007-09-12 Sebastien Pouliot -+ -+ * ConfidenceFactor.cs, PrimalityTests.cs: Updated to match -+ Mono.Security sources. -+ - 2004-05-07 Sebastien Pouliot - - * PrimalityTests.cs: In sync with Mono.Security.dll version. -Index: mcs/class/corlib/Mono.Math/BigInteger.cs -=================================================================== ---- mcs/class/corlib/Mono.Math/BigInteger.cs (revision 85720) -+++ mcs/class/corlib/Mono.Math/BigInteger.cs (revision 85721) -@@ -13,7 +13,7 @@ - // Copyright (c) 2002 Chew Keong TAN - // All rights reserved. - // --// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -+// Copyright (C) 2004, 2007 Novell, Inc (http://www.novell.com) - // - // Permission is hereby granted, free of charge, to any person obtaining - // a copy of this software and associated documentation files (the -@@ -862,10 +862,16 @@ - - public override bool Equals (object o) - { -- if (o == null) return false; -- if (o is int) return (int)o >= 0 && this == (uint)o; -+ if (o == null) -+ return false; -+ if (o is int) -+ return (int)o >= 0 && this == (uint)o; - -- return Kernel.Compare (this, (BigInteger)o) == 0; -+ BigInteger bi = o as BigInteger; -+ if (bi == null) -+ return false; -+ -+ return Kernel.Compare (this, bi) == 0; - } - - #endregion -@@ -894,19 +900,23 @@ - - public bool IsProbablePrime () - { -- if (this < smallPrimes [smallPrimes.Length - 1]) { -+ // can we use our small-prime table ? -+ if (this <= smallPrimes[smallPrimes.Length - 1]) { - for (int p = 0; p < smallPrimes.Length; p++) { -- if (this == smallPrimes [p]) -+ if (this == smallPrimes[p]) - return true; - } -+ // the list is complete, so it's not a prime -+ return false; - } -- else { -- for (int p = 0; p < smallPrimes.Length; p++) { -- if (this % smallPrimes [p] == 0) -- return false; -- } -+ -+ // otherwise check if we can divide by one of the small primes -+ for (int p = 0; p < smallPrimes.Length; p++) { -+ if (this % smallPrimes[p] == 0) -+ return false; - } -- return PrimalityTests.RabinMillerTest (this, Prime.ConfidenceFactor.Medium); -+ // the last step is to confirm the "large" prime with the SPP or Miller-Rabin test -+ return PrimalityTests.Test (this, Prime.ConfidenceFactor.Medium); - } - - #endregion -@@ -1038,18 +1048,12 @@ - { - if (a == 0 || b == 0) return 0; - -- if (a.length >= mod.length << 1) -+ if (a > mod) - a %= mod; - -- if (b.length >= mod.length << 1) -+ if (b > mod) - b %= mod; - -- if (a.length >= mod.length) -- BarrettReduction (a); -- -- if (b.length >= mod.length) -- BarrettReduction (b); -- - BigInteger ret = new BigInteger (a * b); - BarrettReduction (ret); - -@@ -1082,7 +1086,25 @@ - diff = mod - diff; - return diff; - } -+#if true -+ public BigInteger Pow (BigInteger a, BigInteger k) -+ { -+ BigInteger b = new BigInteger (1); -+ if (k == 0) -+ return b; - -+ BigInteger A = a; -+ if (k.TestBit (0)) -+ b = a; -+ -+ for (int i = 1; i < k.BitCount (); i++) { -+ A = Multiply (A, A); -+ if (k.TestBit (i)) -+ b = Multiply (A, b); -+ } -+ return b; -+ } -+#else - public BigInteger Pow (BigInteger b, BigInteger exp) - { - if ((mod.data [0] & 1) == 1) return OddPow (b, exp); -@@ -1146,14 +1168,17 @@ - Montgomery.Reduce (resultNum, mod, mPrime); - } - -- Kernel.SquarePositive (tempNum, ref wkspace); -- Montgomery.Reduce (tempNum, mod, mPrime); -+ // the value of tempNum is required in the last loop -+ if (pos < totalBits - 1) { -+ Kernel.SquarePositive (tempNum, ref wkspace); -+ Montgomery.Reduce (tempNum, mod, mPrime); -+ } - } - - Montgomery.Reduce (resultNum, mod, mPrime); - return resultNum; - } -- -+#endif - #region Pow Small Base - - // TODO: Make tests for this, not really needed b/c prime stuff -@@ -1161,14 +1186,20 @@ - #if !INSIDE_CORLIB - [CLSCompliant (false)] - #endif -+#if true - public BigInteger Pow (uint b, BigInteger exp) - { -+ return Pow (new BigInteger (b), exp); -+ } -+#else -+ public BigInteger Pow (uint b, BigInteger exp) -+ { - // if (b != 2) { - if ((mod.data [0] & 1) == 1) - return OddPow (b, exp); - else - return EvenPow (b, exp); --/* buggy in some cases (like the well tested primes) -+/* buggy in some cases (like the well tested primes) - } else { - if ((mod.data [0] & 1) == 1) - return OddModTwoPow (exp); -@@ -1187,7 +1218,8 @@ - - uint mPrime = Montgomery.Inverse (mod.data [0]); - -- uint pos = (uint)exp.BitCount () - 2; -+ int bc = exp.BitCount () - 2; -+ uint pos = (bc > 1 ? (uint) bc : 1); - - // - // We know that the first itr will make the val b -@@ -1387,8 +1419,9 @@ - - return resultNum; - } -- --/* known to be buggy in some cases -+#endif -+/* known to be buggy in some cases */ -+#if false - private unsafe BigInteger EvenModTwoPow (BigInteger exp) - { - exp.Normalize (); -@@ -1521,7 +1554,7 @@ - resultNum = Montgomery.Reduce (resultNum, mod, mPrime); - return resultNum; - } --*/ -+#endif - #endregion - } - -Index: mcs/class/corlib/Mono.Math/ChangeLog -=================================================================== ---- mcs/class/corlib/Mono.Math/ChangeLog (revision 85720) -+++ mcs/class/corlib/Mono.Math/ChangeLog (revision 85721) -@@ -1,3 +1,12 @@ -+2007-09-12 Sebastien Pouliot -+ -+ * BigInteger.cs: Updated to match Mono.Security sources. -+ -+2007-07-28 Miguel de Icaza -+ -+ * BigInteger.cs: Do not cast inside Equals,instead use the as -+ operator, as reported by Jesse Jones. -+ - 2004-12-03 Sebastien Pouliot - - * BigInteger.cs: Fix issue #70169 in ModPow when modulus is a power of diff --git a/mono-security_includes_warnings.patch b/mono-security_includes_warnings.patch new file mode 100644 index 0000000..86dc861 --- /dev/null +++ b/mono-security_includes_warnings.patch @@ -0,0 +1,10 @@ +--- mono-1.2.6/mono/metadata/security.c.orig 2008-01-14 14:13:02.000000000 -0700 ++++ mono-1.2.6/mono/metadata/security.c 2008-01-14 14:13:16.000000000 -0700 +@@ -11,6 +11,7 @@ + #include + #endif + ++#include + #include + #include + #include diff --git a/mono_1.2.5_p4.patch.bz2 b/mono_1.2.5_p4.patch.bz2 deleted file mode 100644 index 5ee0f35..0000000 --- a/mono_1.2.5_p4.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e89659d670b69fd432ee5d053cad6a945b143e5da42fd6cf56aa010555587170 -size 7315 diff --git a/mono_1.2.5_p5_p6_final.patch b/mono_1.2.5_p5_p6_final.patch deleted file mode 100644 index eb09213..0000000 --- a/mono_1.2.5_p5_p6_final.patch +++ /dev/null @@ -1,402 +0,0 @@ -diff -ru p4/mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/ChangeLog mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/ChangeLog ---- p4/mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/ChangeLog 2007-07-24 15:48:14.000000000 -0600 -+++ mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/ChangeLog 2007-08-22 09:06:16.000000000 -0600 -@@ -1,3 +1,7 @@ -+2007-08-17 Sebastien Pouliot -+ -+ * CryptoStream.cs: Write cannot depend on buffer.Length (fix #82428) -+ - 2007-05-16 Sebastien Pouliot - - * CryptoStream.cs: Fix another problem that can occurs with WriteByte. -diff -ru p4/mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs ---- p4/mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs 2007-07-24 15:48:14.000000000 -0600 -+++ mono-1.2.5/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs 2007-08-22 09:06:16.000000000 -0600 -@@ -261,6 +261,8 @@ - if (_stream == null) - throw new ArgumentNullException ("inner stream was diposed"); - -+ int buffer_length = count; -+ - // partial block (in progress) - if ((_partialCount > 0) && (_partialCount != _transform.InputBlockSize)) { - int remainder = _transform.InputBlockSize - _partialCount; -@@ -297,7 +299,7 @@ - } - - if (rem > 0) -- Buffer.BlockCopy (buffer, buffer.Length - rem, _workingBlock, 0, rem); -+ Buffer.BlockCopy (buffer, buffer_length - rem, _workingBlock, 0, rem); - _partialCount = rem; - count = 0; // the last block, if any, is in _workingBlock - } else { -diff -ru p4/mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog ---- p4/mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog 2007-08-16 14:15:18.000000000 -0600 -+++ mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog 2007-08-22 09:06:16.000000000 -0600 -@@ -1,3 +1,8 @@ -+2007-08-20 Jonathan Pobst -+ [Backport of r84479] -+ * StatusStrip.cs: Make sure the item's parent gets set in SetDisplayedItems. -+ [Fixes bug #82481] -+ - 2007-08-14 Rolf Bjarne Kvinge - - * Control.cs: [Backport of r83588, fixes bug #82433] CreateControl: create -diff -ru p4/mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusStrip.cs mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusStrip.cs ---- p4/mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusStrip.cs 2007-07-24 15:48:49.000000000 -0600 -+++ mono-1.2.5/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusStrip.cs 2007-08-22 09:06:16.000000000 -0600 -@@ -247,12 +247,15 @@ - { - this.displayed_items.Clear (); - -- foreach (ToolStripItem tsi in this.Items) -+ foreach (ToolStripItem tsi in this.Items) { -+ tsi.Parent = this; -+ - if (tsi.Placement == ToolStripItemPlacement.Main) { - this.displayed_items.AddNoOwnerOrLayout (tsi); - tsi.InternalVisible = true; - } else - tsi.InternalVisible = false; -+ } - } - - protected override void WndProc (ref Message m) -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/ChangeLog mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/ChangeLog ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/ChangeLog 2007-07-24 15:47:57.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/ChangeLog 2007-08-27 12:21:41.000000000 -0600 -@@ -1,3 +1,8 @@ -+2007-08-10 Gert Driesen -+ -+ * PagesConfigurationHandler.cs: Use enum for EnableSessionState. -+ * PagesConfiguration.cs: Use enum for EnableSessionState. -+ - 2007-05-01 Marek Habersack - - * HttpCapabilitiesBase.cs: move the User-Agent code to a separate -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs 2007-04-25 12:49:28.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfiguration.cs 2007-08-27 12:21:41.000000000 -0600 -@@ -36,7 +36,7 @@ - class PagesConfiguration - { - internal bool Buffer = true; -- internal string EnableSessionState = "true"; -+ internal PagesEnableSessionState EnableSessionState = PagesEnableSessionState.True; - internal bool EnableViewState = true; - internal bool EnableViewStateMac = false; - internal bool SmartNavigation = false; -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfigurationHandler.cs mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfigurationHandler.cs ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfigurationHandler.cs 2007-04-25 12:49:28.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.Configuration/PagesConfigurationHandler.cs 2007-08-27 12:21:41.000000000 -0600 -@@ -48,11 +48,22 @@ - - attvalue = AttValue ("enableSessionState", section); - if (attvalue != null) { -- if (attvalue != "true" && attvalue != "false" && attvalue != "ReadOnly") -+ switch (attvalue) { -+ case "true": -+ config.EnableSessionState = PagesEnableSessionState.True; -+ break; -+ case "ReadOnly": -+ config.EnableSessionState = PagesEnableSessionState.ReadOnly; -+ break; -+ case "false": -+ config.EnableSessionState = PagesEnableSessionState.False; -+ break; -+ default: - HandlersUtil.ThrowException ("The 'enableSessionState' attribute" - + " is case sensitive and must be one of the following values:" - + " false, true, ReadOnly.", section); -- config.EnableSessionState = attvalue; -+ break; -+ } - } - - attvalue = AttValue ("enableViewState", section); -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog 2007-07-24 15:47:55.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog 2007-08-27 12:21:40.000000000 -0600 -@@ -1,3 +1,7 @@ -+2007-08-10 Gert Driesen -+ -+ * PagesEnableSessionState.cs: Marked internal on 1.0 profile. -+ - 2007-07-16 Vladimir Krasnov - - * ProfileGroupSettingsCollection.cs: added ResetInternal internal -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs 2007-04-25 12:49:04.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.Configuration_2.0/PagesEnableSessionState.cs 2007-08-27 12:21:40.000000000 -0600 -@@ -28,14 +28,17 @@ - - using System.Resources; - --#if NET_2_0 - namespace System.Web.Configuration - { -- public enum PagesEnableSessionState -- { -- False = 0, -- ReadOnly = 1, -- True = 2 -- } --} -+#if NET_2_0 -+ public -+#else -+ internal - #endif -+ enum PagesEnableSessionState -+ { -+ False = 0, -+ ReadOnly = 1, -+ True = 2 -+ } -+} -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog 2007-07-24 15:47:57.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/ChangeLog 2007-08-27 13:33:31.000000000 -0600 -@@ -1,3 +1,10 @@ -+2007-07-31 Marek Habersack -+ -+ * SessionInProcHandler.cs: initialize the static session objects -+ collection from the application state instead of using -+ SessionStateUtility.GetSessionStaticObjects. Fixes bug #82193 -+ * SessionStateServerHandler.cs: as above -+ - 2007-06-20 Marek Habersack - - * SessionInProcHandler.cs: use HttpRuntime.InternalCache to keep -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs 2007-07-24 15:47:57.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionInProcHandler.cs 2007-08-27 13:33:31.000000000 -0600 -@@ -77,7 +77,7 @@ - public override SessionStateStoreData CreateNewStoreData (HttpContext context, int timeout) - { - return new SessionStateStoreData (new SessionStateItemCollection (), -- SessionStateUtility.GetSessionStaticObjects(context), -+ HttpApplicationFactory.ApplicationState.SessionObjects, - timeout); - } - -@@ -156,7 +156,7 @@ - item.items = new SessionStateItemCollection (); - } - return new SessionStateStoreData (item.items, -- SessionStateUtility.GetSessionStaticObjects(context), -+ HttpApplicationFactory.ApplicationState.SessionObjects, - item.timeout); - } catch { - // we want such errors to be passed to the application. -@@ -344,7 +344,7 @@ - expireCallback (key, - new SessionStateStoreData ( - item.items, -- SessionStateUtility.GetSessionStaticObjects (HttpContext.Current), -+ HttpApplicationFactory.ApplicationState.SessionObjects, - item.timeout)); - } else - expireCallback (key, null); -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs 2007-04-25 12:49:06.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.SessionState_2.0/SessionStateServerHandler.cs 2007-08-27 13:33:31.000000000 -0600 -@@ -47,7 +47,7 @@ - public override SessionStateStoreData CreateNewStoreData (HttpContext context, int timeout) - { - return new SessionStateStoreData (new SessionStateItemCollection (), -- SessionStateUtility.GetSessionStaticObjects(context), -+ HttpApplicationFactory.ApplicationState.SessionObjects, - timeout); - } - -@@ -73,9 +73,11 @@ - out SessionStateActions actions, - bool exclusive) - { -+#if TRACE - Console.WriteLine ("SessionStateServerHandler.GetItemInternal"); - Console.WriteLine ("\tid == {0}", id); - Console.WriteLine ("\tpath == {0}", context.Request.FilePath); -+#endif - locked = false; - lockAge = TimeSpan.MinValue; - lockId = Int32.MinValue; -@@ -92,11 +94,15 @@ - exclusive); - - if (item == null) { -+#if TRACE - Console.WriteLine ("\titem is null (locked == {0}, actions == {1})", locked, actions); -+#endif - return null; - } - if (actions == SessionStateActions.InitializeItem) { -+#if TRACE - Console.WriteLine ("\titem needs initialization"); -+#endif - return CreateNewStoreData (context, item.Timeout); - } - SessionStateItemCollection items = null; -@@ -150,7 +156,9 @@ - - public override void Initialize (string name, NameValueCollection config) - { -+#if TRACE - Console.WriteLine ("SessionStateServerHandler.Initialize"); -+#endif - if (String.IsNullOrEmpty (name)) - name = "Session Server handler"; - privateConfig = config; -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.UI/ChangeLog mono-1.2.5/mcs/class/System.Web/System.Web.UI/ChangeLog ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-07-24 15:47:56.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.UI/ChangeLog 2007-08-27 12:21:41.000000000 -0600 -@@ -1,7 +1,21 @@ -+2007-08-10 Gert Driesen -+ -+ * PageParser.cs: Replace enableSessionState and readOnlySessionState -+ bools with enum backed field. Move 1.0 profile code for checking value -+ of EnableSessionState pages config to PagesConfigurationHandler. -+ Fixes bug #82392 for 1.0 profile. -+ -+2007-08-09 Marek Habersack -+ -+ * PageParser.cs: honor web.config enableSessionState -+ ReadOnly setting instead of overwriting based on default value for -+ page directive EnableSessionState. Patch from Joel Reed -+ , thanks! Fixes bug #82392 -+ - 2007-07-24 Igor Zelmanovich - - * ClientScriptManager.cs: fixed: GetCallbackEventReference method. -- -+ - 2007-07-23 Igor Zelmanovich - - * Page.cs: refactoring: __doPostBack client script -diff -ru p4/mono-1.2.5/mcs/class/System.Web/System.Web.UI/PageParser.cs mono-1.2.5/mcs/class/System.Web/System.Web.UI/PageParser.cs ---- p4/mono-1.2.5/mcs/class/System.Web/System.Web.UI/PageParser.cs 2007-07-24 15:47:56.000000000 -0600 -+++ mono-1.2.5/mcs/class/System.Web/System.Web.UI/PageParser.cs 2007-08-27 12:21:41.000000000 -0600 -@@ -43,14 +43,13 @@ - [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)] - public sealed class PageParser : TemplateControlParser - { -- bool enableSessionState = true; -+ PagesEnableSessionState enableSessionState = PagesEnableSessionState.True; - bool enableViewStateMac = true; -- bool smartNavigation = false; -+ bool smartNavigation; - bool haveTrace; - bool trace; - bool notBuffer; - TraceMode tracemode; -- bool readonlySessionState; - string responseEncoding; - string contentType; - int codepage = -1; -@@ -112,24 +111,7 @@ - #endif - - notBuffer = !ps.Buffer; --#if NET_2_0 -- switch (ps.EnableSessionState) { -- case PagesEnableSessionState.True: -- case PagesEnableSessionState.ReadOnly: -- enableSessionState = true; -- break; -- -- default: -- enableSessionState = false; -- break; -- } --#else -- if (String.Compare (ps.EnableSessionState, "true", true, CultureInfo.InvariantCulture) == 0) -- enableSessionState = true; -- else -- enableSessionState = false; --#endif -- -+ enableSessionState = ps.EnableSessionState; - enableViewStateMac = ps.EnableViewStateMac; - smartNavigation = ps.SmartNavigation; - validateRequest = ps.ValidateRequest; -@@ -165,23 +147,23 @@ - // note: the 'enableSessionState' configuration property is - // processed in a case-sensitive manner while the page-level - // attribute is processed case-insensitive -- string enabless = GetString (atts, "EnableSessionState", enableSessionState.ToString ()); -+ string enabless = GetString (atts, "EnableSessionState", null); - if (enabless != null) { -- readonlySessionState = (String.Compare (enabless, "readonly", true) == 0); -- if (readonlySessionState == true || String.Compare (enabless, "true", true) == 0) { -- enableSessionState = true; -- } else if (String.Compare (enabless, "false", true) == 0) { -- enableSessionState = false; -- } else { -+ if (String.Compare (enabless, "readonly", true) == 0) -+ enableSessionState = PagesEnableSessionState.ReadOnly; -+ else if (String.Compare (enabless, "true", true) == 0) -+ enableSessionState = PagesEnableSessionState.True; -+ else if (String.Compare (enabless, "false", true) == 0) -+ enableSessionState = PagesEnableSessionState.False; -+ else - ThrowParseException ("Invalid value for enableSessionState: " + enabless); -- } - } - - string cp = GetString (atts, "CodePage", null); - if (cp != null) { - if (responseEncoding != null) - ThrowParseException ("CodePage and ResponseEncoding are " + -- "mutually exclusive."); -+ "mutually exclusive."); - - int codepage = 0; - try { -@@ -436,7 +418,10 @@ - } - - internal bool EnableSessionState { -- get { return enableSessionState; } -+ get { -+ return enableSessionState == PagesEnableSessionState.True || -+ ReadOnlySessionState; -+ } - } - - internal bool EnableViewStateMac { -@@ -448,7 +433,9 @@ - } - - internal bool ReadOnlySessionState { -- get { return readonlySessionState; } -+ get { -+ return enableSessionState == PagesEnableSessionState.ReadOnly; -+ } - } - - internal bool HaveTrace { -diff -ru p4/mono-1.2.5/mono/metadata/ChangeLog mono-1.2.5/mono/metadata/ChangeLog ---- p4/mono-1.2.5/mono/metadata/ChangeLog 2007-08-16 14:14:57.000000000 -0600 -+++ mono-1.2.5/mono/metadata/ChangeLog 2007-08-27 12:21:21.000000000 -0600 -@@ -1,3 +1,8 @@ -+2007-08-23 Robert Jordan -+ -+ * marshal.c (Marshal_ReAllocHGlobal) : Fix GlobalReAlloc's flags. -+ Fixes #82499. -+ - 2007-07-03 Jonathan Chambers - - * marshal.c: Implement COM Objects as return type for -diff -ru p4/mono-1.2.5/mono/metadata/marshal.c mono-1.2.5/mono/metadata/marshal.c ---- p4/mono-1.2.5/mono/metadata/marshal.c 2007-08-16 14:14:57.000000000 -0600 -+++ mono-1.2.5/mono/metadata/marshal.c 2007-08-27 12:21:21.000000000 -0600 -@@ -10673,7 +10673,7 @@ - } - - #ifdef PLATFORM_WIN32 -- res = GlobalReAlloc (ptr, (gulong)size, 0); -+ res = GlobalReAlloc (ptr, (gulong)size, GMEM_MOVEABLE); - #else - res = g_try_realloc (ptr, (gulong)size); - #endif