diff --git a/.cvsignore b/.cvsignore index dc483d4..e353546 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mono-1.2.4.tar.bz2 +mono-1.2.5.1.tar.bz2 diff --git a/mono-1.1.16.1-use-monodir.patch b/mono-1.1.16.1-use-monodir.patch deleted file mode 100644 index 254cfc3..0000000 --- a/mono-1.1.16.1-use-monodir.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- mono-1.1.16.1/scripts/script_umask.in.monodir 2006-08-17 15:19:51.000000000 +0200 -+++ mono-1.1.16.1/scripts/script_umask.in 2006-08-17 15:20:30.000000000 +0200 -@@ -1,3 +1,3 @@ - #!/bin/sh - umask 077 --exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@" -+exec @bindir@/@mono_interp@ `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@" ---- mono-1.1.16.1/scripts/mono-service.in.monodir 2006-08-17 15:19:37.000000000 +0200 -+++ mono-1.1.16.1/scripts/mono-service.in 2006-08-17 15:21:22.000000000 +0200 -@@ -29,4 +29,4 @@ - fi - - export MONO_DISABLE_SHM=1 --exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe $args & /dev/null & -+exec @bindir@/@mono_interp@ `@bindir@/monodir`/@framework_version@/@exe_name@.exe $args & /dev/null & ---- mono-1.1.16.1/scripts/script.in.monodir 2006-08-17 15:19:45.000000000 +0200 -+++ mono-1.1.16.1/scripts/script.in 2006-08-17 15:20:51.000000000 +0200 -@@ -1,2 +1,2 @@ - #!/bin/sh --exec @bindir@/@mono_interp@ @mono_instdir@/@framework_version@/@exe_name@.exe "$@" -+exec @bindir@/@mono_interp@ `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@" diff --git a/mono-1.1.17.1-use-monodir.patch b/mono-1.1.17.1-use-monodir.patch deleted file mode 100644 index 3584b09..0000000 --- a/mono-1.1.17.1-use-monodir.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- mono-1.1.17.1/scripts/script.in.use-monodir 2006-08-25 21:35:14.000000000 +0200 -+++ mono-1.1.17.1/scripts/script.in 2006-09-01 14:57:01.000000000 +0200 -@@ -1,2 +1,2 @@ - #!/bin/sh --exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@" -+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@" ---- mono-1.1.17.1/scripts/mono-service.in.use-monodir 2006-08-25 21:35:14.000000000 +0200 -+++ mono-1.1.17.1/scripts/mono-service.in 2006-09-01 14:57:20.000000000 +0200 -@@ -29,4 +29,4 @@ - fi - - export MONO_DISABLE_SHM=1 --exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe $args & /dev/null & -+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe $args & /dev/null & ---- mono-1.1.17.1/scripts/script_umask.in.use-monodir 2006-08-25 21:35:14.000000000 +0200 -+++ mono-1.1.17.1/scripts/script_umask.in 2006-09-01 14:57:27.000000000 +0200 -@@ -1,3 +1,3 @@ - #!/bin/sh - umask 077 --exec @bindir@/@mono_interp@ $MONO_OPTIONS @mono_instdir@/@framework_version@/@exe_name@.exe "$@" -+exec @bindir@/@mono_interp@ $MONO_OPTIONS `@bindir@/monodir`/@framework_version@/@exe_name@.exe "$@" diff --git a/mono-1.2.4-metadata.patch b/mono-1.2.4-metadata.patch new file mode 100644 index 0000000..84c6bae --- /dev/null +++ b/mono-1.2.4-metadata.patch @@ -0,0 +1,11 @@ +--- mono-1.2.4/mono/metadata/Makefile.am 2007-04-21 15:18:32.000000000 +0100 ++++ mono-1.2.4/mono/metadata/Makefile.am-new 2007-04-21 18:03:33.000000000 +0100 +@@ -21,7 +21,7 @@ + # + noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la + +-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" ++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\" + + # + # Make sure any prefix changes are updated in the binaries too. diff --git a/mono-1251-metadata.patch b/mono-1251-metadata.patch new file mode 100644 index 0000000..28d3f26 --- /dev/null +++ b/mono-1251-metadata.patch @@ -0,0 +1,11 @@ +--- mono-1.2.5.1/mono/metadata/Makefile.am 2007-10-05 12:28:28.000000000 +0100 ++++ mono-1.2.5.1/mono/metadata/Makefile-new.am 2007-10-05 12:29:31.000000000 +0100 +@@ -9,7 +9,7 @@ + # optimisation is required to actually inline them + AM_CFLAGS = -O + else +-assembliesdir = $(exec_prefix)/lib ++assembliesdir = $(libdir) + confdir = $(sysconfdir) + endif + diff --git a/mono-CVE-2006-5072-TempFileCollection.patch b/mono-CVE-2006-5072-TempFileCollection.patch deleted file mode 100644 index e5f4514..0000000 --- a/mono-CVE-2006-5072-TempFileCollection.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- mono-1.1.17.1.orig/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs 2006-07-05 22:58:48.000000000 +0100 -+++ mono-1.1.17.1/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs 2006-10-06 08:46:00.000000000 +0100 -@@ -31,6 +31,7 @@ - using System.IO; - using System.Security; - using System.Security.Permissions; -+using System.Runtime.InteropServices; - - namespace System.CodeDom.Compiler { - -@@ -45,6 +46,7 @@ - bool keepfiles; - string basepath; - Random rnd; -+ string ownTempDir; - - public TempFileCollection () - : this (String.Empty, false) -@@ -67,16 +69,15 @@ - { - get { - if(basepath==null) { -- // note: this property *cannot* change TempDir property -- string temp = tempdir; -- if (temp.Length == 0) { -- // this call ensure the Environment permissions check -- temp = Path.GetTempPath (); -- } - - if (rnd == null) - rnd = new Random (); - -+ // note: this property *cannot* change TempDir property -+ string temp = tempdir; -+ if (temp.Length == 0) -+ temp = GetOwnTempDir (); -+ - // Create a temporary file at the target directory. This ensures - // that the generated file name is unique. - FileStream f = null; -@@ -111,6 +112,32 @@ - return(basepath); - } - } -+ -+ string GetOwnTempDir () -+ { -+ if (ownTempDir != null) -+ return ownTempDir; -+ -+ // this call ensure the Environment permissions check -+ string basedir = Path.GetTempPath (); -+ -+ // Create a subdirectory with the correct user permissions -+ int res = -1; -+ do { -+ int num = rnd.Next (); -+ num++; -+ ownTempDir = Path.Combine (basedir, num.ToString("x")); -+ if (Directory.Exists (ownTempDir)) -+ continue; -+ res = mkdir (ownTempDir, 0x1c0); -+ if (res != 0) { -+ if (!Directory.Exists (ownTempDir)) -+ throw new IOException (); -+ // Somebody already created the dir, keep trying -+ } -+ } while (res != 0); -+ return ownTempDir; -+ } - - int ICollection.Count { - get { -@@ -190,14 +217,25 @@ - - public void Delete() - { -- string[] filenames=new string[filehash.Count]; -- filehash.Keys.CopyTo(filenames, 0); -+ bool allDeleted = true; -+ string[] filenames = new string[filehash.Count]; -+ filehash.Keys.CopyTo (filenames, 0); - - foreach(string file in filenames) { - if((bool)filehash[file]==false) { - File.Delete(file); - filehash.Remove(file); -- } -+ } else -+ allDeleted = false; -+ } -+ if (basepath != null) { -+ string tmpFile = basepath + ".tmp"; -+ File.Delete (tmpFile); -+ basepath = null; -+ } -+ if (allDeleted && ownTempDir != null) { -+ Directory.Delete (ownTempDir, true); -+ ownTempDir = null; - } - if (basepath != null) { - string tmpFile = basepath + ".tmp"; -@@ -228,5 +266,6 @@ - Dispose(false); - } - -+ [DllImport ("libc")] private static extern int mkdir (string olpath, uint mode); - } - } diff --git a/mono-libdir.patch b/mono-libdir.patch index 3e903ea..430185c 100644 --- a/mono-libdir.patch +++ b/mono-libdir.patch @@ -11,18 +11,7 @@ Index: mono-1.1.16/configure.in echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make -Index: mono-1.1.16/mono/metadata/Makefile.am -=================================================================== ---- mono-1.1.16.orig/mono/metadata/Makefile.am -+++ mono-1.1.16/mono/metadata/Makefile.am -@@ -9,7 +9,7 @@ else - # The mingw math.h has "extern inline" functions that dont appear in libs, so - # optimisation is required to actually inline them - AM_CFLAGS = -O --assembliesdir = $(exec_prefix)/lib -+assembliesdir = $(libdir) - confdir = $(sysconfdir) - endif + Index: mono-1.1.16/scripts/Makefile.am =================================================================== @@ -121,17 +110,6 @@ Index: mono-1.1.16/mcs/tools/cilc/res-Makefile CFLAGS += -static -fpic $(shell pkg-config --cflags glib-2.0 gobject-2.0 mono) $(EXTRAINCLUDES) -I. ---- mono-1.1.16.1/mono/metadata/Makefile.am.libdir 2006-07-05 23:55:46.000000000 +0200 -+++ mono-1.1.16.1/mono/metadata/Makefile.am 2006-08-17 17:54:36.000000000 +0200 -@@ -21,7 +21,7 @@ - # - noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la - --INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\" -DMONO_CFG_DIR=\"$(confdir)\" - - # - # Make sure any prefix changes are updated in the binaries too. --- mono-1.1.16.1/mono/metadata/assembly.c.libdir 2006-08-17 17:52:42.000000000 +0200 +++ mono-1.1.16.1/mono/metadata/assembly.c 2006-08-17 17:56:21.000000000 +0200 @@ -521,7 +521,7 @@ diff --git a/mono.spec b/mono.spec index acba1fa..cc6e01d 100644 --- a/mono.spec +++ b/mono.spec @@ -1,6 +1,6 @@ Name: mono -Version: 1.2.4 -Release: 2%{?dist} +Version: 1.2.5.1 +Release: 1%{?dist} Summary: a .NET runtime environment Group: Development/Languages @@ -14,7 +14,7 @@ BuildRequires: bison BuildRequires: glib2-devel BuildRequires: pkgconfig BuildRequires: libicu-devel -BuildRequires: libgdiplus-devel >= 1.2.1 +BuildRequires: libgdiplus-devel >= 1.2.4 BuildRequires: zlib-devel %ifarch ia64 BuildRequires: libunwind @@ -31,6 +31,8 @@ Patch1: mono-1.1.13.4-selinux-ia64.patch Patch2: mono-1.1.13.4-ppc-threading.patch Patch3: mono-libdir.patch Patch4: mono-1.2.3-use-monodir.patch +Patch5: mono-1.2.4-metadata.patch +Patch6: mono-1251-metadata.patch %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -251,6 +253,7 @@ which is fully managed and actively maintained. %setup -q %patch1 -p1 -b .selinux-ia64 %patch2 -p1 -b .ppc-threading +%patch5 -p1 %patch3 -p1 -b .libdir %patch4 -p1 -b .use-monodir @@ -316,6 +319,8 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %doc AUTHORS COPYING.LIB ChangeLog NEWS README %{_bindir}/mono %{_bindir}/monodir +%{_bindir}/mono-api-* +%{_bindir}/smcs %mono_bin certmgr %mono_bin chktrust %mono_bin gacutil @@ -324,6 +329,8 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %mono_bin mozroots %mono_bin setreg %mono_bin sn +%mono_bin installvst +%mono_bin monolinker %{_bindir}/mkbundle2 %{_libdir}/libmono.so.* %{_libdir}/libMonoPosixHelper.so @@ -336,6 +343,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %{_mandir}/man1/mozroots.1.gz %{_mandir}/man1/setreg.1.gz %{_mandir}/man1/sn.1.gz +%{_mandir}/man1/vbnc.1.gz +%{_mandir}/man1/monolinker.1.gz +%{_mandir}/man1/resgen.1.gz %{_mandir}/man5/mono-config.5.gz %dir %{monodir} %dir %{monodir}/1.0 @@ -350,16 +360,17 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %gac_dll Microsoft.VisualC %gac_dll Mono.C5 %gac_dll Mono.Cairo +%{_libdir}/mono/gac/Mono.Cecil %gac_dll Mono.CompilerServices.SymbolWriter %gac_dll Mono.GetOptions %gac_dll Mono.Posix %gac_dll Mono.Security %gac_dll System %gac_dll System.Configuration -%gac_dll System.Core %gac_dll System.Drawing %gac_dll System.Security %gac_dll System.Xml +%gac_dll System.Core %gac_dll cscompmgd %gac_dll CustomMarshalers %gac_dll OpenSystem.C @@ -372,15 +383,12 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %config (noreplace) %{_sysconfdir}/mono/1.0/machine.config %config (noreplace) %{_sysconfdir}/mono/2.0/machine.config %{_libdir}/libikvm-native.so +%mono_bin httpcfg %files devel %defattr(-,root,root,-) %{_bindir}/monodis %{_bindir}/pedump -%{_bindir}/monodiet -%{_bindir}/mono-api-diff -%{_bindir}/mono-api-info -%{_bindir}/mono-api-info2 %mono_bin_1 al al %mono_bin_2 al2 al %mono_bin caspol @@ -389,7 +397,6 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %mono_bin dtd2xsd %mono_bin dtd2rng %mono_bin genxs -%mono_bin installvst %mono_bin sgen %mono_bin_1 ilasm ilasm %mono_bin_2 ilasm2 ilasm @@ -407,8 +414,6 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %mono_bin secutil %mono_bin signcode %mono_bin xbuild -%{monodir}/1.0/culevel.exe -%{monodir}/1.0/culevel.exe.mdb %{monodir}/1.0/ictool.exe %{monodir}/1.0/ictool.exe.mdb %{_mandir}/man1/al.1.gz @@ -429,7 +434,6 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %{_mandir}/man1/secutil.1.gz %{_mandir}/man1/sgen.1.gz %{_mandir}/man1/signcode.1.gz -%{_mandir}/man1/vbnc.1.gz %{_mandir}/man1/monoburg.* %gac_dll PEAPI %gac_dll Microsoft.Build.Engine @@ -453,6 +457,7 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %dir %{_datadir}/mono-1.0 %dir %{_datadir}/mono-1.0/mono %dir %{_datadir}/mono-1.0/mono/cil +%{_libdir}/mono/1.0/culevel* %files nunit %defattr(-,root,root,-) @@ -508,7 +513,6 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %gac_dll System.Web.Services %mono_bin disco %mono_bin soapsuds -%mono_bin_2 httpcfg httpcfg %mono_bin_1 wsdl wsdl %mono_bin_2 wsdl2 wsdl %mono_bin xsd @@ -520,6 +524,8 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %config (noreplace) %{_sysconfdir}/mono/1.0/DefaultWsdlHelpGenerator.aspx %config (noreplace) %{_sysconfdir}/mono/2.0/DefaultWsdlHelpGenerator.aspx %config (noreplace) %{_sysconfdir}/mono/2.0/web.config +# Hmm, this doesn't seem to ship with the .exe file? +%mono_bin httpcfg %{_mandir}/man1/httpcfg.1.gz %files data @@ -565,11 +571,12 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %gac_dll IBM.Data.DB2 %changelog -* Tue Aug 14 2007 Jesse Keating 1.2.4-2 -- Rebuild for buildsystem error +* Fri Oct 05 2007 Paul F. Johnson - 1.2.5.1-1 +- bump +- added new parts (mono-linker, resgen and mono-cecil) -* Sat Jun 2 2007 Christopher Aillon 1.2.4-1 -- Update to 1.2.4 +* Thu Apr 21 2007 Paul F. Johnson - 1.2.4-1 +- update from 1.2.3 * Sun Apr 1 2007 Matthias Clasen - 1.2.3-3 - Fix a spec format error (#210633) diff --git a/sources b/sources index ce1dff2..6432bbf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d106acef8e3af3593c779f281541a0b mono-1.2.4.tar.bz2 +dfede0c8c29384a8f8a6953a9bd06224 mono-1.2.5.1.tar.bz2