[gentoo-commits] gentoo-x86 commit in dev-lisp/cmucl/files: 20e-execstack-fixes.patch 20e-customize-lisp-implementation-version.patch

[Andrey Grozin (grozin)]

grozin      14/02/06 12:57:26

  Added:                20e-execstack-fixes.patch
                        20e-customize-lisp-implementation-version.patch
  Log:
  Version bump
  
  (Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

Revision  Changes    Path
1.1                  dev-lisp/cmucl/files/20e-execstack-fixes.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20e-execstack-fixes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20e-execstack-fixes.patch?rev=1.1&content-type=text/plain

Index: 20e-execstack-fixes.patch
===================================================================
diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
--- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
+++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -297,3 +297,7 @@
 function_end_breakpoint_end:
 
 
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
--- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
+++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -1051,3 +1051,7 @@
 	.end
 
 #endif /* LINKAGE_TABLE */
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
--- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
+++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
@@ -3,6 +3,8 @@
  * Simple backtrace facility.  More or less from Rob's lisp version.
  */
 
+#include "os-common.h"
+
 #include <stdio.h>
 #include <signal.h>
 #include "lisp.h"
diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
--- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
+++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -460,3 +460,7 @@
 
 	.export	function_end_breakpoint_end
 function_end_breakpoint_end
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
--- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
+++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
@@ -995,3 +995,7 @@
 /*  doe(yperr_string) */
 /*  doe(ypprot_err) */
 #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
--- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
+++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
@@ -5,6 +5,9 @@
  *
  */
 
+#include "os-common.h"
+#include <time.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
--- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
+++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -402,3 +402,7 @@
 	move	v0, a1
 	j	_restore_state
 	.end	save_state
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
--- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
+++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
@@ -0,0 +1 @@
+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
--- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
+++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -721,3 +721,7 @@
 	SET_SIZE(fpu_restore)
 	
 #endif
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
--- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
+++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -837,3 +837,7 @@
  * End:
  */						
 		
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
--- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
+++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
@@ -798,3 +798,7 @@
 ENDFUNC(undefined_foreign_symbol_trap)
 
 #endif /* LINKAGE_TABLE */
+
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif



1.1                  dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch?rev=1.1&content-type=text/plain

Index: 20e-customize-lisp-implementation-version.patch
===================================================================
diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
--- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
+++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
@@ -187,8 +187,10 @@
 
 (defun lisp-implementation-version ()
   "Returns a string describing the implementation version."
-  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
-	  #+unicode _" Unicode" #-unicode ""))
+  (format nil "~X~A~A"
+          c:byte-fasl-file-version
+          #+unicode "-unicode" #-unicode ""
+          *lisp-implementation-version*))
 
 (defun machine-instance ()
   "Returns a string giving the name of the local machine."