From 61e5de892b568d430f57ff6184eeff45661f7280 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 12 Mar 2007 22:40:32 +0100 Subject: [PATCH] ruby: updated to 1.8.6 --- ruby/.footprint | 12 ++- ruby/.md5sum | 5 +- ruby/Pkgfile | 7 +- ruby/ruby-array_shift.diff | 22 ------ ruby/ruby-valgrind.diff | 148 +++++++++++++++++++++---------------- 5 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 ruby/ruby-array_shift.diff diff --git a/ruby/.footprint b/ruby/.footprint index bb2a734..5c5fa8a 100644 --- a/ruby/.footprint +++ b/ruby/.footprint @@ -8,9 +8,9 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/testrb drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libruby-static.a -lrwxrwxrwx root/root usr/lib/libruby.so -> libruby.so.1.8.5 -lrwxrwxrwx root/root usr/lib/libruby.so.1.8 -> libruby.so.1.8.5 --rwxr-xr-x root/root usr/lib/libruby.so.1.8.5 +lrwxrwxrwx root/root usr/lib/libruby.so -> libruby.so.1.8.6 +lrwxrwxrwx root/root usr/lib/libruby.so.1.8 -> libruby.so.1.8.6 +-rwxr-xr-x root/root usr/lib/libruby.so.1.8.6 drwxr-xr-x root/root usr/lib/ruby/ drwxr-xr-x root/root usr/lib/ruby/1.8/ -rw-r--r-- root/root usr/lib/ruby/1.8/English.rb @@ -38,6 +38,9 @@ drwxr-xr-x root/root usr/lib/ruby/1.8/date/ -rw-r--r-- root/root usr/lib/ruby/1.8/date2.rb -rw-r--r-- root/root usr/lib/ruby/1.8/debug.rb -rw-r--r-- root/root usr/lib/ruby/1.8/delegate.rb +-rw-r--r-- root/root usr/lib/ruby/1.8/digest.rb +drwxr-xr-x root/root usr/lib/ruby/1.8/digest/ +-rw-r--r-- root/root usr/lib/ruby/1.8/digest/sha2.rb drwxr-xr-x root/root usr/lib/ruby/1.8/dl/ -rw-r--r-- root/root usr/lib/ruby/1.8/dl/import.rb -rw-r--r-- root/root usr/lib/ruby/1.8/dl/struct.rb @@ -124,8 +127,10 @@ drwxr-xr-x root/root usr/lib/ruby/1.8/linux/ -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/curses.so -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/dbm.so -rw-r--r-- root/root usr/lib/ruby/1.8/linux/defines.h +-rw-r--r-- root/root usr/lib/ruby/1.8/linux/digest.h -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/digest.so drwxr-xr-x root/root usr/lib/ruby/1.8/linux/digest/ +-rwxr-xr-x root/root usr/lib/ruby/1.8/linux/digest/bubblebabble.so -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/digest/md5.so -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/digest/rmd160.so -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/digest/sha1.so @@ -164,6 +169,7 @@ drwxr-xr-x root/root usr/lib/ruby/1.8/linux/racc/ -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/strscan.so -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/syck.so -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/syslog.so +-rwxr-xr-x root/root usr/lib/ruby/1.8/linux/thread.so -rw-r--r-- root/root usr/lib/ruby/1.8/linux/util.h -rw-r--r-- root/root usr/lib/ruby/1.8/linux/version.h -rwxr-xr-x root/root usr/lib/ruby/1.8/linux/zlib.so diff --git a/ruby/.md5sum b/ruby/.md5sum index ec1f448..eb4d7a9 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1,5 +1,4 @@ -d7d12dd9124c9b7d55cdbbee313e3931 ruby-1.8.5-p12.tar.gz +e558a0e00ae318d43bf6ff9af452bad2 ruby-1.8.6.tar.bz2 d662b7a68bb88366f2a76b433d765d75 ruby-arch.diff -9d57b2fefcb86461814462033daff254 ruby-array_shift.diff 8c83dec7591afc3bbea9d8325a7e29b4 ruby-rdoc-multiple_files.diff -af301cb7830a880e7b30fdba1a64ef97 ruby-valgrind.diff +cd66fbea67ab149312a9903048d78157 ruby-valgrind.diff diff --git a/ruby/Pkgfile b/ruby/Pkgfile index a5826f4..10579d5 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -6,11 +6,11 @@ # Depends on: openssl name=ruby -version=1.8.5-p12 +version=1.8.6 release=1 -source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.gz \ +source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.bz2 \ $name-arch.diff $name-valgrind.diff \ - $name-rdoc-multiple_files.diff $name-array_shift.diff) + $name-rdoc-multiple_files.diff) build () { cd $name-$version @@ -18,7 +18,6 @@ build () { patch -Np1 -i ../$name-valgrind.diff patch -Np1 -i ../$name-arch.diff patch -Np1 -i ../$name-rdoc-multiple_files.diff - patch -Np1 -i ../$name-array_shift.diff ./configure --prefix=/usr --enable-shared --enable-pthread \ --mandir=/usr/man diff --git a/ruby/ruby-array_shift.diff b/ruby/ruby-array_shift.diff deleted file mode 100644 index 3d75248..0000000 --- a/ruby/ruby-array_shift.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -aur ruby-1.8.5.orig/array.c ruby-1.8.5/array.c ---- ruby-1.8.5.orig/array.c 2006-06-24 16:53:36.000000000 +0200 -+++ ruby-1.8.5/array.c 2006-11-12 11:58:46.187673233 +0100 -@@ -501,8 +501,16 @@ - rb_ary_modify_check(ary); - if (RARRAY(ary)->len == 0) return Qnil; - top = RARRAY(ary)->ptr[0]; -- ary_make_shared(ary); -- RARRAY(ary)->ptr++; /* shift ptr */ -+ if (RARRAY(ary)->len < ARY_DEFAULT_SIZE && !FL_TEST(ary, ELTS_SHARED)) { -+ MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr + 1, VALUE, RARRAY(ary)->len - 1); -+ } -+ else { -+ if (!FL_TEST(ary, ELTS_SHARED)) { -+ RARRAY(ary)->ptr[0] = Qnil; -+ } -+ ary_make_shared(ary); -+ RARRAY(ary)->ptr++; /* shift ptr */ -+ } - RARRAY(ary)->len--; - - return top; diff --git a/ruby/ruby-valgrind.diff b/ruby/ruby-valgrind.diff index 478635c..ea5ba13 100644 --- a/ruby/ruby-valgrind.diff +++ b/ruby/ruby-valgrind.diff @@ -1,7 +1,7 @@ -diff -aur ruby-1.8.5.orig/Makefile.in ruby-1.8.5/Makefile.in ---- ruby-1.8.5.orig/Makefile.in 2006-08-08 04:37:43.000000000 +0200 -+++ ruby-1.8.5/Makefile.in 2006-08-25 16:44:19.273278750 +0200 -@@ -33,7 +33,7 @@ +diff -aur ruby-1.8.6.orig/Makefile.in ruby-1.8.6/Makefile.in +--- ruby-1.8.6.orig/Makefile.in 2007-02-13 00:01:19.000000000 +0100 ++++ ruby-1.8.6/Makefile.in 2007-03-12 22:34:13.553865125 +0100 +@@ -34,7 +34,7 @@ empty = OUTFLAG = @OUTFLAG@$(empty) @@ -10,10 +10,12 @@ diff -aur ruby-1.8.5.orig/Makefile.in ruby-1.8.5/Makefile.in CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ EXTLDFLAGS = -diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure ---- ruby-1.8.5.orig/configure 2006-08-25 10:34:16.000000000 +0200 -+++ ruby-1.8.5/configure 2006-08-25 16:44:19.281279250 +0200 -@@ -682,6 +682,9 @@ +Only in ruby-1.8.6: aclocal.m4 +Only in ruby-1.8.6: autom4te.cache +diff -aur ruby-1.8.6.orig/configure ruby-1.8.6/configure +--- ruby-1.8.6.orig/configure 2007-03-12 20:19:03.000000000 +0100 ++++ ruby-1.8.6/configure 2007-03-12 22:36:40.826257700 +0100 +@@ -697,6 +697,9 @@ MAKEDIRS LIBOBJS ALLOCA @@ -23,7 +25,7 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure DLDFLAGS ARCH_FLAG STATIC -@@ -747,7 +750,10 @@ +@@ -762,7 +765,10 @@ CPPFLAGS CPP YACC @@ -35,33 +37,15 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure # Initialize some variables set by options. -@@ -794,7 +800,7 @@ - psdir='${docdir}' - libdir='${exec_prefix}/lib' - localedir='${datarootdir}/locale' --mandir='${datarootdir}/man' -+mandir='${prefix}/man' - - ac_prev= - ac_dashdash= -@@ -1297,7 +1303,7 @@ - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -- --mandir=DIR man documentation [DATAROOTDIR/man] -+ --mandir=DIR man documentation [PREFIX/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] -@@ -1340,6 +1346,7 @@ - --disable-largefile omit support for large files +@@ -1356,6 +1362,7 @@ --enable-pthread use pthread library. + --disable-fastthread do not use the fastthread mutex --enable-setreuid use setreuid()/setregid() according to need even if obsolete. + --enable-valgrind use valgrind support. --disable-rpath embed run path into extension libraries. --enable-shared build a shared library for Ruby. --enable-install-doc build and install rdoc indexes during install -@@ -1370,6 +1377,11 @@ +@@ -1387,6 +1394,11 @@ YFLAGS The list of arguments that will be passed by default to $YACC. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications. @@ -73,7 +57,39 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -@@ -17964,6 +17976,217 @@ +@@ -12983,13 +12995,11 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include /* for off_t */ +- #include ++#include + int + main () + { +-int (*fp) (FILE *, off_t, int) = fseeko; +- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ++return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); + ; + return 0; + } +@@ -13029,13 +13039,11 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #define _LARGEFILE_SOURCE 1 +-#include /* for off_t */ +- #include ++#include + int + main () + { +-int (*fp) (FILE *, off_t, int) = fseeko; +- return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ++return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); + ; + return 0; + } +@@ -15762,6 +15770,219 @@ fi fi @@ -108,7 +124,7 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -151,7 +167,7 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 @@ -265,7 +281,9 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure + # Put the nasty error message in config.log where it belongs + echo "$VALGRIND_PKG_ERRORS" >&5 + -+ have_valgrind=no ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++ have_valgrind=no +elif test $pkg_failed = untried; then + have_valgrind=no +else @@ -276,22 +294,22 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure + have_valgrind=yes +fi + -+ if test x"$have_valgrind" = xyes; then -+ cat >>confdefs.h <<\_ACEOF ++ if test x"$have_valgrind" = xyes; then ++ cat >>confdefs.h <<\_ACEOF +#define HAVE_VALGRIND 1 +_ACEOF + -+ elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then -+ { { echo "$as_me:$LINENO: error: valgrind support requested but valgrind not found" >&5 ++ elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then ++ { { echo "$as_me:$LINENO: error: valgrind support requested but valgrind not found" >&5 +echo "$as_me: error: valgrind support requested but valgrind not found" >&2;} + { (exit 1); exit 1; }; } -+ fi ++ fi +fi + DEFAULT_KCODE="KCODE_NONE" -@@ -20080,6 +20303,9 @@ +@@ -17796,6 +18017,9 @@ MAKEDIRS!$MAKEDIRS$ac_delim LIBOBJS!$LIBOBJS$ac_delim ALLOCA!$ALLOCA$ac_delim @@ -301,7 +319,7 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure DLDFLAGS!$DLDFLAGS$ac_delim ARCH_FLAG!$ARCH_FLAG$ac_delim STATIC!$STATIC$ac_delim -@@ -20089,9 +20315,6 @@ +@@ -17805,9 +18029,6 @@ DLEXT2!$DLEXT2$ac_delim LIBEXT!$LIBEXT$ac_delim LINK_SO!$LINK_SO$ac_delim @@ -311,7 +329,7 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then -@@ -20133,6 +20356,9 @@ +@@ -17849,6 +18070,9 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF @@ -321,19 +339,19 @@ diff -aur ruby-1.8.5.orig/configure ruby-1.8.5/configure TRY_LINK!$TRY_LINK$ac_delim STRIP!$STRIP$ac_delim EXTSTATIC!$EXTSTATIC$ac_delim -@@ -20178,7 +20404,7 @@ +@@ -17893,7 +18117,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 43; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 42; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 45; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -diff -aur ruby-1.8.5.orig/configure.in ruby-1.8.5/configure.in ---- ruby-1.8.5.orig/configure.in 2006-08-08 04:37:43.000000000 +0200 -+++ ruby-1.8.5/configure.in 2006-08-25 16:44:19.281279250 +0200 -@@ -832,6 +832,20 @@ +diff -aur ruby-1.8.6.orig/configure.in ruby-1.8.6/configure.in +--- ruby-1.8.6.orig/configure.in 2007-02-28 14:23:42.000000000 +0100 ++++ ruby-1.8.6/configure.in 2007-03-12 22:34:52.828103236 +0100 +@@ -890,6 +890,20 @@ fi fi @@ -342,23 +360,23 @@ diff -aur ruby-1.8.5.orig/configure.in ruby-1.8.5/configure.in + [want_valgrind=$enableval], [want_valgrind=auto]) + +if test x"$want_valgrind" != xno; then -+ PKG_CHECK_MODULES(VALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) ++ PKG_CHECK_MODULES(VALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) + -+ if test x"$have_valgrind" = xyes; then -+ AC_DEFINE(HAVE_VALGRIND) -+ elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then -+ AC_MSG_ERROR(valgrind support requested but valgrind not found) -+ fi ++ if test x"$have_valgrind" = xyes; then ++ AC_DEFINE(HAVE_VALGRIND) ++ elif test x"$want_valgrind" = xyes -a x"$have_valgrind" = xno; then ++ AC_MSG_ERROR(valgrind support requested but valgrind not found) ++ fi +fi + dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" -diff -aur ruby-1.8.5.orig/gc.c ruby-1.8.5/gc.c ---- ruby-1.8.5.orig/gc.c 2006-08-25 10:12:46.000000000 +0200 -+++ ruby-1.8.5/gc.c 2006-08-25 16:44:19.285279500 +0200 -@@ -30,6 +30,12 @@ - #include +diff -aur ruby-1.8.6.orig/gc.c ruby-1.8.6/gc.c +--- ruby-1.8.6.orig/gc.c 2007-03-03 08:30:46.000000000 +0100 ++++ ruby-1.8.6/gc.c 2007-03-12 22:36:25.201367287 +0100 +@@ -34,6 +34,12 @@ + #include #endif +#ifdef HAVE_VALGRIND @@ -367,10 +385,10 @@ diff -aur ruby-1.8.5.orig/gc.c ruby-1.8.5/gc.c +#define VALGRIND_MAKE_MEM_DEFINED(p, n) /* empty */ +#endif + - #ifdef __ia64__ - #include - #if defined(__FreeBSD__) -@@ -634,6 +640,9 @@ + void re_free_registers _((struct re_registers*)); + void rb_io_fptr_finalize _((struct OpenFile*)); + +@@ -623,6 +629,9 @@ register long n; { VALUE v; @@ -380,7 +398,7 @@ diff -aur ruby-1.8.5.orig/gc.c ruby-1.8.5/gc.c while (n--) { v = *x; if (is_pointer_to_heap((void *)v)) { -@@ -724,7 +733,10 @@ +@@ -713,7 +722,10 @@ { register RVALUE *obj; -- 2.30.2