From 30f31923bedb76393d05d19c37311f3a93bf029a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 8 Dec 2014 22:27:30 +0100 Subject: [PATCH] - updated to 0.8.0 --- format-security.patch | 91 +++++++++++++++++++++++++++++++++++++++++++ no-regex_syntax.patch | 19 +++++++++ pnet-systemffi.patch | 75 +++++++++++------------------------ pnet-systemgc.patch | 34 ++++++++++++++++ pnet.spec | 42 +++++++++++++------- 5 files changed, 194 insertions(+), 67 deletions(-) create mode 100644 format-security.patch create mode 100644 no-regex_syntax.patch create mode 100644 pnet-systemgc.patch diff --git a/format-security.patch b/format-security.patch new file mode 100644 index 0000000..08e5487 --- /dev/null +++ b/format-security.patch @@ -0,0 +1,91 @@ +--- pnet-0.8.0/ilasm/ilasm_grammar.y~ 2004-10-13 12:19:33.000000000 +0200 ++++ pnet-0.8.0/ilasm/ilasm_grammar.y 2014-12-08 21:50:07.786452309 +0100 +@@ -84,8 +84,7 @@ + } + else + { +- fprintf(stderr, msg); +- putc('\n', stderr); ++ fprintf(stderr, "%s\n", msg); + } + ILAsmErrors = 1; + } +--- pnet-0.8.0/engine/dumpconfig.c~ 2007-01-23 20:49:02.000000000 +0100 ++++ pnet-0.8.0/engine/dumpconfig.c 2014-12-08 21:53:51.623117354 +0100 +@@ -37,7 +37,7 @@ + { + const int columnWidth=30; + int spaces=columnWidth-strlen(left); +- fprintf(stream,left); ++ fprintf(stream,"%s",left); + while((spaces-- >= 0)) fputc(' ',stream); + if(right) + { +--- pnet-0.8.0/cscc/c/c_crt0.c.orig 2014-12-08 21:55:41.276449893 +0100 ++++ pnet-0.8.0/cscc/c/c_crt0.c 2014-12-08 21:57:15.689782543 +0100 +@@ -40,11 +40,11 @@ + { + if(node) + { +- CCWarningOnLine(yygetfilename(node), yygetlinenum(node), msg); ++ CCWarningOnLine(yygetfilename(node), yygetlinenum(node), "%s", msg); + } + else + { +- CCWarning(msg); ++ CCWarning("%s", msg); + } + } + +@@ -55,11 +55,11 @@ + { + if(node) + { +- CCErrorOnLine(yygetfilename(node), yygetlinenum(node), msg); ++ CCErrorOnLine(yygetfilename(node), yygetlinenum(node), "%s", msg); + } + else + { +- CCError(msg); ++ CCError("%s", msg); + } + } + +--- pnet-0.8.0/cscc/c/c_declspec.c.orig 2014-12-08 21:57:33.706449079 +0100 ++++ pnet-0.8.0/cscc/c/c_declspec.c 2014-12-08 21:58:35.246448635 +0100 +@@ -551,7 +551,7 @@ + } + else + { +- CCErrorOnLine(yygetfilename(node), yygetlinenum(node), msg2); ++ CCErrorOnLine(yygetfilename(node), yygetlinenum(node), "%s", msg2); + } + } + else +@@ -562,7 +562,7 @@ + } + else + { +- CCError(msg2); ++ CCError("%s", msg2); + } + } + } +@@ -583,7 +583,7 @@ + } + else + { +- CCWarningOnLine(yygetfilename(node), yygetlinenum(node), msg2); ++ CCWarningOnLine(yygetfilename(node), yygetlinenum(node), "%s", msg2); + } + } + else +@@ -594,7 +594,7 @@ + } + else + { +- CCWarning(msg2); ++ CCWarning("%s", msg2); + } + } + } diff --git a/no-regex_syntax.patch b/no-regex_syntax.patch new file mode 100644 index 0000000..1e78c8d --- /dev/null +++ b/no-regex_syntax.patch @@ -0,0 +1,19 @@ +--- pnet-0.8.0/doc/cvmdoc.py~ 2005-08-02 20:31:00.000000000 +0200 ++++ pnet-0.8.0/doc/cvmdoc.py 2014-12-08 22:05:04.449779150 +0100 +@@ -9,7 +9,6 @@ + import sys + import cgi + import re +-import regex_syntax + cvm_doc=""" + """ + +@@ -339,7 +338,7 @@ + #RHYS PART of the puzzle starts + codes={} + codefile=open(sys.argv[2], 'r') +- prog=re.compile("^#define[ \t]*COP_", regex_syntax.RE_SYNTAX_GREP) ++ prog=re.compile("^#define[ \t]*COP_") + while 1: + line = codefile.readline() + if not line: break diff --git a/pnet-systemffi.patch b/pnet-systemffi.patch index bdaa49a..23325fd 100644 --- a/pnet-systemffi.patch +++ b/pnet-systemffi.patch @@ -1,24 +1,17 @@ ---- Makefile.am~ 2005-08-17 00:42:32.000000000 +0000 -+++ Makefile.am 2005-11-01 14:49:05.134576856 +0000 -@@ -12,14 +12,14 @@ - - if PNET_TOOLS - --SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include support image dumpasm engine ilasm ildasm \ -+SUBDIRS = . $(LIBGC_DIR) include support image dumpasm engine ilasm ildasm \ - ilalink ilsize ilnative ilheader ilfind ildd codegen cscc \ - resgen ilstrip ilranlib ilgac csdoc csant clrwrap samples doc tests - - else - - ## We only want to build the runtime engine. --SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include coremul support image engine -+SUBDIRS = . $(LIBGC_DIR) include coremul support image engine +--- pnet-0.8.0/Makefile.am~ 2007-02-06 21:54:52.000000000 +0100 ++++ pnet-0.8.0/Makefile.am 2014-12-08 21:45:52.143120825 +0100 +@@ -1,9 +1,5 @@ + OPT_SUBDIRS = +-if USING_LIBFFI +-OPT_SUBDIRS += libffi +-endif +- + if USING_LIBGC + OPT_SUBDIRS += libgc endif - ---- configure.in~ 2005-08-17 00:42:32.000000000 +0000 -+++ configure.in 2005-11-01 14:56:02.761087976 +0000 +--- pnet-0.8.0/configure.in~ 2014-12-08 21:44:33.000000000 +0100 ++++ pnet-0.8.0/configure.in 2014-12-08 21:46:41.479787135 +0100 @@ -559,7 +559,7 @@ dnl Set up libffi-related variables. AC_SUBST(FFILIBS) @@ -28,38 +21,14 @@ AC_DEFINE(HAVE_LIBFFI, 1, [Define if you are using libffi]) else FFILIBS="" ---- configure.in~ 2006-03-13 01:26:28.000000000 +0000 -+++ configure.in 2006-03-13 01:28:22.350401250 +0000 -@@ -659,32 +659,10 @@ - dnl under $srcdir from a subdirectory of the build tree. This is - dnl different depending on whether $srcdir is absolute or relative. - if echo $srcdir | grep '^[[~/]]'; then -- ffisrcdir=$srcdir/libffi - gcsrcdir=$srcdir/libgc - else -- ffisrcdir=../$srcdir/libffi - gcsrcdir=../$srcdir/libgc - fi -- if test x$withffi = xyes ; then -- if test ! -d libffi ; then -- mkdir libffi -- fi -- cd "libffi" -- ${CONFIG_SHELL-/bin/sh} ${ffisrcdir}/configure --disable-shared \ -- --enable-multilib=no \ -- --disable-dependency-tracking \ -- --host="${host}" --build="${build}" --target="${target}" \ -- --disable-fast-install --prefix="${prefix}" \ -- --exec-prefix="${exec_prefix}" --bindir="${bindir}" \ -- --sbindir="${sbindir}" --libexecdir="${libexecdir}" \ -- --datadir="${datadir}" --sysconfdir="${sysconfdir}" \ -- --sharedstatedir="${sharedstatedir}" \ -- --localstatedir="${localstatedir}" --libdir="${libdir}/pnet" \ -- --includedir="${includedir}/pnet" \ -- --oldincludedir="${oldincludedir}/pnet" --infodir="${infodir}" \ -- --mandir="${mandir}" --srcdir="${ffisrcdir}" || exit 1 -- cd .. -- fi +@@ -692,10 +692,6 @@ + fi + AM_CONDITIONAL(USING_LIBGC, test x$withgc = xyes) - if test x$withgc = xyes ; then - if test ! -d libgc ; then +-if test x$withffi = xyes; then +- AC_CONFIG_SUBDIRS(libffi) +-fi +- + if test x$withgc = xyes; then + AC_CONFIG_SUBDIRS(libgc) + fi diff --git a/pnet-systemgc.patch b/pnet-systemgc.patch new file mode 100644 index 0000000..3003f53 --- /dev/null +++ b/pnet-systemgc.patch @@ -0,0 +1,34 @@ +--- pnet-0.8.0/Makefile.am~ 2014-12-08 21:59:37.000000000 +0100 ++++ pnet-0.8.0/Makefile.am 2014-12-08 22:07:36.989778046 +0100 +@@ -1,9 +1,5 @@ + OPT_SUBDIRS = + +-if USING_LIBGC +-OPT_SUBDIRS += libgc +-endif +- + if PNET_TOOLS + + OPT_SUBDIRS += dumpasm \ +--- pnet-0.8.0/configure.in~ 2014-12-08 21:59:37.000000000 +0100 ++++ pnet-0.8.0/configure.in 2014-12-08 22:08:33.553110970 +0100 +@@ -682,7 +682,7 @@ + dnl Set up libgc-related variables. + AC_SUBST(GCLIBS) + if test x$withgc = xyes ; then +- GCLIBS='$(top_builddir)/libgc/.libs/libgc.a' ++ GCLIBS='-lgc' + AC_DEFINE(HAVE_LIBGC, 1, [Define if you are using libgc]) + if test x$typedalloc = xtrue ; then + AC_DEFINE(IL_USE_TYPED_ALLOCATION, 1, [Define if you are using typed allocation with libgc]) +@@ -692,10 +692,6 @@ + fi + AM_CONDITIONAL(USING_LIBGC, test x$withgc = xyes) + +-if test x$withgc = xyes; then +- AC_CONFIG_SUBDIRS(libgc) +-fi +- + AC_OUTPUT([ + Makefile + include/Makefile diff --git a/pnet.spec b/pnet.spec index 8ad294b..88b740d 100644 --- a/pnet.spec +++ b/pnet.spec @@ -2,18 +2,22 @@ Summary: The DotGNU Portable .NET tools Summary(pl.UTF-8): Narzędzia Portable .NET z projektu DotGNU Summary(pt_BR.UTF-8): Ferramentas Portable .NET DotGNU Name: pnet -Version: 0.7.4 -Release: 5 +Version: 0.8.0 +Release: 1 License: GPL Group: Development/Languages -Source0: http://www.southern-storm.com.au/download/%{name}-%{version}.tar.gz -# Source0-md5: 064baa390e6b1ae9463f68c929e36f74 +Source0: http://download.savannah.gnu.org/releases/dotgnu-pnet/%{name}-%{version}.tar.gz +# Source0-md5: 84cb3612d7175bd9e476c88e66fe19f9 Patch0: %{name}-systemffi.patch -URL: http://www.southern-storm.com.au/portable_net.html +Patch1: %{name}-systemgc.patch +Patch2: format-security.patch +Patch3: no-regex_syntax.patch +URL: http://www.gnu.org/software/dotgnu/pnet.html BuildRequires: autoconf BuildRequires: automake BuildRequires: bison BuildRequires: flex +BuildRequires: gc-devel BuildRequires: libffi-devel BuildRequires: treecc >= 0.3.6 Requires: %{name}-compiler = %{version} @@ -278,10 +282,16 @@ Header de desenvolviemnto da Portable .NET. %prep %setup -q -%patch0 -p0 +%patch0 -p1 +# pnet uses gc incompatible with system lib and links statically to it +#%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%{__rm} ilasm/ilasm_grammar.c %build -rm -f missing +%{__libtoolize} %{__aclocal} %{__autoconf} %{__automake} @@ -301,13 +311,16 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -# shutup check-files -rm -f $RPM_BUILD_ROOT%{_bindir}/al # just a link +# junk removal +%{__rm} $RPM_BUILD_ROOT%{_bindir}/{al,cli-unknown-*} +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{al.1*,cli-unknown-*} +%{__mv} $RPM_BUILD_ROOT%{_bindir}/{,pnet-}resgen +%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{,pnet-}resgen.1 -# links in mandir -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{al.1*,cli-unknown-*} -mv $RPM_BUILD_ROOT%{_bindir}/{,pnet-}resgen -mv $RPM_BUILD_ROOT%{_mandir}/man1/{,pnet-}resgen.1 +# don't distribute libgc +%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/{gc*,leak_detector.h} +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/gc +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgc.* %clean rm -rf $RPM_BUILD_ROOT @@ -334,7 +347,7 @@ rm -rf $RPM_BUILD_ROOT %files compiler-common %defattr(644,root,root,755) -%doc AUTHORS ChangeLog HACKING NEWS README doc/*.html +%doc AUTHORS ChangeLog NEWS README doc/cvmdoc %attr(755,root,root) %{_bindir}/cscc %attr(755,root,root) %{_bindir}/csant %attr(755,root,root) %{_bindir}/ilalink @@ -365,6 +378,7 @@ rm -rf $RPM_BUILD_ROOT %files compiler-bf %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/cscc/plugins/cscc-b %attr(755,root,root) %{_libdir}/cscc/plugins/cscc-bf %files compiler-visualbasic -- 2.44.0